Convert OfflinePageAutoFetcher client to use BrowserInterfaceBroker

This CL converts OfflinePageAutoFetcher mojom interface clients in
chrome to use BrowserInterfaceBroker.

Bug: 936482
Change-Id: Idd3f464cbb13641037a1406bc34199d4a59eb6e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1941727Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#720458}

chrome/app/chrome_content_browser_overlay_manifest.cc

@@ -22,7 +22,6 @@
 #include "chrome/common/cache_stats_recorder.mojom.h"
 #include "chrome/common/media_router/mojom/media_router.mojom.h"
 #include "chrome/common/net_benchmarking.mojom.h"
-#include "chrome/common/offline_page_auto_fetcher.mojom.h"
 #include "components/autofill/content/common/mojom/autofill_driver.mojom.h"
 #include "components/contextual_search/content/common/mojom/contextual_search_js_api_service.mojom.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy.mojom.h"
@@ -127,7 +126,6 @@ const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
             service_manager::Manifest::InterfaceList<
                 autofill::mojom::AutofillDriver,
                 autofill::mojom::PasswordManagerDriver,
-                chrome::mojom::OfflinePageAutoFetcher,
 #if defined(OS_CHROMEOS)
                 chromeos_camera::mojom::CameraAppHelper,
                 chromeos::cellular_setup::mojom::CellularSetup,

chrome/browser/chrome_browser_interface_binders.cc

@@ -44,6 +44,8 @@
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h"
+#include "chrome/browser/offline_pages/android/offline_page_auto_fetcher.h"
+#include "chrome/common/offline_page_auto_fetcher.mojom.h"
 #include "content/public/browser/web_contents.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/blink/public/mojom/installedapp/installed_app_provider.mojom.h"
@@ -229,6 +231,8 @@ void PopulateChromeFrameBinders(
   map->Add<blink::mojom::MediaControlsMenuHost>(base::BindRepeating(
       &ForwardToJavaFrame<blink::mojom::MediaControlsMenuHost>));
 #endif
+  map->Add<chrome::mojom::OfflinePageAutoFetcher>(
+      base::BindRepeating(&offline_pages::OfflinePageAutoFetcher::Create));
   if (base::FeatureList::IsEnabled(features::kWebPayments)) {
     map->Add<payments::mojom::PaymentRequest>(base::BindRepeating(
         &ForwardToJavaFrame<payments::mojom::PaymentRequest>));

chrome/browser/chrome_content_browser_client.cc

@@ -397,7 +397,6 @@
 #include "chrome/browser/chrome_browser_main_android.h"
 #include "chrome/browser/download/android/available_offline_content_provider.h"
 #include "chrome/browser/download/android/intercept_oma_download_navigation_throttle.h"
-#include "chrome/browser/offline_pages/android/offline_page_auto_fetcher.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/common/chrome_descriptors.h"
 #include "components/crash/content/browser/child_exit_observer_android.h"
@@ -4111,11 +4110,6 @@ void ChromeContentBrowserClient::InitWebContextInterfaces() {
   // Register mojo ContentTranslateDriver interface only for main frame.
   frame_interfaces_parameterized_->AddInterface(
       base::BindRepeating(&language::BindContentTranslateDriver));
-
-#if defined(OS_ANDROID)
-  frame_interfaces_parameterized_->AddInterface(
-      base::BindRepeating(&offline_pages::OfflinePageAutoFetcher::Create));
-#endif
 }
 
 void ChromeContentBrowserClient::InitNetworkContextsParentDirectory() {

chrome/browser/offline_pages/android/offline_page_auto_fetcher.cc

@@ -72,8 +72,8 @@ void OfflinePageAutoFetcher::CancelSchedule() {
 
 // static
 void OfflinePageAutoFetcher::Create(
-    mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver,
-    content::RenderFrameHost* render_frame_host) {
+    content::RenderFrameHost* render_frame_host,
+    mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver) {
   // Lifetime of the self owned receiver can exceed the render frame host, so
   // OfflinePageAutoFetcher does not retain a reference.
   mojo::MakeSelfOwnedReceiver(

chrome/browser/offline_pages/android/offline_page_auto_fetcher.h

@@ -31,8 +31,8 @@ class OfflinePageAutoFetcher : public chrome::mojom::OfflinePageAutoFetcher {
   void CancelSchedule() override;
 
   static void Create(
-      mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver,
-      content::RenderFrameHost* render_frame_host);
+      content::RenderFrameHost* render_frame_host,
+      mojo::PendingReceiver<chrome::mojom::OfflinePageAutoFetcher> receiver);
 
  private:
   OfflinePageAutoFetcherService* GetService();

chrome/renderer/net/page_auto_fetcher_helper_android.cc

@@ -11,7 +11,7 @@
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
-#include "services/service_manager/public/cpp/interface_provider.h"
+#include "third_party/blink/public/common/browser_interface_broker_proxy.h"
 
 PageAutoFetcherHelper::PageAutoFetcherHelper(content::RenderFrame* render_frame)
     : render_frame_(render_frame) {}
@@ -53,7 +53,7 @@ void PageAutoFetcherHelper::CancelSchedule() {
 bool PageAutoFetcherHelper::Bind() {
   if (fetcher_)
     return true;
-  render_frame_->GetRemoteInterfaces()->GetInterface(
+  render_frame_->GetBrowserInterfaceBroker()->GetInterface(
       fetcher_.BindNewPipeAndPassReceiver());
   return fetcher_.is_bound();
 }