BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 23 insertions, 3 deletions

diff --git a/chromium/chrome/browser/ui/webui/media/media_feeds_ui.cc b/chromium/chrome/browser/ui/webui/media/media_feeds_ui.cc
index 9fe5e0b04b8..5ef3915cd3f 100644
--- a/chromium/chrome/browser/ui/webui/media/media_feeds_ui.cc
+++ b/chromium/chrome/browser/ui/webui/media/media_feeds_ui.cc
@@ -64,13 +64,16 @@ void MediaFeedsUI::GetMediaFeeds(GetMediaFeedsCallback callback) {
 
 void MediaFeedsUI::GetItemsForMediaFeed(int64_t feed_id,
                                         GetItemsForMediaFeedCallback callback) {
-  GetMediaHistoryService()->GetItemsForMediaFeedForDebug(feed_id,
-                                                         std::move(callback));
+  GetMediaHistoryService()->GetMediaFeedItems(
+      media_history::MediaHistoryKeyedService::GetMediaFeedItemsRequest::
+          CreateItemsForDebug(feed_id),
+      std::move(callback));
 }
 
 void MediaFeedsUI::FetchMediaFeed(int64_t feed_id,
                                   FetchMediaFeedCallback callback) {
-  GetMediaFeedsService()->FetchMediaFeed(feed_id, std::move(callback));
+  GetMediaFeedsService()->FetchMediaFeed(feed_id, /*bypass_cache=*/false,
+                                         nullptr, std::move(callback));
 }
 
 void MediaFeedsUI::GetDebugInformation(GetDebugInformationCallback callback) {
@@ -81,6 +84,11 @@ void MediaFeedsUI::GetDebugInformation(GetDebugInformationCallback callback) {
   info->safe_search_pref_value =
       GetProfile()->GetPrefs()->GetBoolean(prefs::kMediaFeedsSafeSearchEnabled);
 
+  info->background_fetching_feature_enabled =
+      base::FeatureList::IsEnabled(media::kMediaFeedsBackgroundFetching);
+  info->background_fetching_pref_value = GetProfile()->GetPrefs()->GetBoolean(
+      prefs::kMediaFeedsBackgroundFetching);
+
   std::move(callback).Run(std::move(info));
 }
 
@@ -93,6 +101,15 @@ void MediaFeedsUI::SetSafeSearchEnabledPref(
   std::move(callback).Run();
 }
 
+void MediaFeedsUI::SetBackgroundFetchingPref(
+    bool value,
+    SetBackgroundFetchingPrefCallback callback) {
+  GetProfile()->GetPrefs()->SetBoolean(prefs::kMediaFeedsBackgroundFetching,
+                                       value);
+
+  std::move(callback).Run();
+}
+
 media_history::MediaHistoryKeyedService*
 MediaFeedsUI::GetMediaHistoryService() {
   media_history::MediaHistoryKeyedService* service =
diff --git a/chromium/chrome/browser/ui/webui/media/media_feeds_ui.h b/chromium/chrome/browser/ui/webui/media/media_feeds_ui.h
index 73de089c839..dc382578d43 100644
--- a/chromium/chrome/browser/ui/webui/media/media_feeds_ui.h
+++ b/chromium/chrome/browser/ui/webui/media/media_feeds_ui.h
@@ -40,6 +40,9 @@ class MediaFeedsUI : public ui::MojoWebUIController,
   void SetSafeSearchEnabledPref(
       bool value,
       SetSafeSearchEnabledPrefCallback callback) override;
+  void SetBackgroundFetchingPref(
+      bool value,
+      SetBackgroundFetchingPrefCallback callback) override;
 
  private:
   media_history::MediaHistoryKeyedService* GetMediaHistoryService();