Convert crostini_upgrader::mojom::PageHandlerFactory client to BrowserInterfaceBroker

This CL converts crostini_upgrader::mojom::PageHandlerFactory
mojom interface clients for chrome os in chrome to use
BrowserInterfaceBroker.

Bug: 936482, 1002647
Change-Id: I9ccea33e088a8496f548a464e20bf2a29cde9cf4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1969128
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726263}

chrome/app/chrome_content_browser_overlay_manifest.cc

@@ -20,7 +20,6 @@
 #include "services/service_manager/public/cpp/manifest_builder.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader.mojom.h"
 #include "chromeos/services/media_perception/public/mojom/media_perception.mojom.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
 #include "chromeos/services/network_config/public/mojom/constants.mojom.h"  // nogncheck
@@ -88,7 +87,6 @@ const service_manager::Manifest& GetChromeContentBrowserOverlayManifest() {
             "navigation:frame", "renderer",
             service_manager::Manifest::InterfaceList<
 #if defined(OS_CHROMEOS)
-                chromeos::crostini_upgrader::mojom::PageHandlerFactory,
                 chromeos::multidevice_setup::mojom::MultiDeviceSetup,
                 chromeos::multidevice_setup::mojom::PrivilegedHostDeviceSetter,
                 chromeos::network_config::mojom::CrosNetworkConfig,

chrome/browser/chrome_browser_interface_binders.cc

@@ -118,6 +118,8 @@
 #include "chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog.h"
 #include "chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer.mojom.h"
 #include "chrome/browser/ui/webui/chromeos/crostini_installer/crostini_installer_ui.h"
+#include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader.mojom.h"
+#include "chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
 #endif
 
@@ -445,9 +447,15 @@ void PopulateChromeWebUIFrameBinders(
   RegisterWebUIControllerInterfaceBinder<
       chromeos::cellular_setup::CellularSetupDialogUI,
       chromeos::cellular_setup::mojom::CellularSetup>(map);
+
   RegisterWebUIControllerInterfaceBinder<
       chromeos::CrostiniInstallerUI,
       chromeos::crostini_installer::mojom::PageHandlerFactory>(map);
+
+  RegisterWebUIControllerInterfaceBinder<
+      chromeos::CrostiniUpgraderUI,
+      chromeos::crostini_upgrader::mojom::PageHandlerFactory>(map);
+
   RegisterWebUIControllerInterfaceBinder<
       chromeos::machine_learning::MachineLearningInternalsUI,
       chromeos::machine_learning::mojom::PageHandler>(map);

chrome/browser/resources/chromeos/crostini_upgrader/browser_proxy.js

@@ -17,7 +17,8 @@ export class BrowserProxy {
     this.handler = new chromeos.crostiniUpgrader.mojom.PageHandlerRemote();
 
     const factory =
-        chromeos.crostiniUpgrader.mojom.PageHandlerFactory.getRemote();
+        chromeos.crostiniUpgrader.mojom.PageHandlerFactory.getRemote(
+            /*useBrowserInterfaceBroker=*/ true);
     factory.createPageHandler(
         this.callbackRouter.$.bindNewPipeAndPassRemote(),
         this.handler.$.bindNewPipeAndPassReceiver());

chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.cc

@@ -96,14 +96,11 @@ CrostiniUpgraderUI::CrostiniUpgraderUI(content::WebUI* web_ui)
   source->UseStringsJs();
   source->EnableReplaceI18nInJS();
   content::WebUIDataSource::Add(Profile::FromWebUI(web_ui), source);
-
-  AddHandlerToRegistry(base::BindRepeating(
-      &CrostiniUpgraderUI::BindPageHandlerFactory, base::Unretained(this)));
 }
 
 CrostiniUpgraderUI::~CrostiniUpgraderUI() = default;
 
-void CrostiniUpgraderUI::BindPageHandlerFactory(
+void CrostiniUpgraderUI::BindInterface(
     mojo::PendingReceiver<
         chromeos::crostini_upgrader::mojom::PageHandlerFactory>
         pending_receiver) {
@@ -137,4 +134,6 @@ void CrostiniUpgraderUI::OnWebUICloseDialog() {
   ui::MojoWebDialogUI::CloseDialog(nullptr);
 }
 
+WEB_UI_CONTROLLER_TYPE_IMPL(CrostiniUpgraderUI)
+
 }  // namespace chromeos

chrome/browser/ui/webui/chromeos/crostini_upgrader/crostini_upgrader_ui.h

@@ -31,12 +31,14 @@ class CrostiniUpgraderUI
     launch_closure_ = std::move(launch_closure);
   }
 
- private:
-  void BindPageHandlerFactory(
-      mojo::PendingReceiver<
-          chromeos::crostini_upgrader::mojom::PageHandlerFactory>
-          pending_receiver);
+  // Instantiates implementor of the
+  // chromeos::crostini_upgrader::mojom::PageHandlerFactory mojo interface
+  // passing the pending receiver that will be internally bound.
+  void BindInterface(mojo::PendingReceiver<
+                     chromeos::crostini_upgrader::mojom::PageHandlerFactory>
+                         pending_receiver);
 
+ private:
   // chromeos::crostini_upgrader::mojom::PageHandlerFactory:
   void CreatePageHandler(
       mojo::PendingRemote<chromeos::crostini_upgrader::mojom::Page>
@@ -55,6 +57,8 @@ class CrostiniUpgraderUI
 
   bool can_close_ = false;
 
+  WEB_UI_CONTROLLER_TYPE_DECL();
+
   DISALLOW_COPY_AND_ASSIGN(CrostiniUpgraderUI);
 };