Migrate add_supervision.mojom to the new Mojo types

Convert the implementation and all users of the
add_supervision::mojom::AddSupervisionHandler interface.

Bug: 955171
Change-Id: Ic9acc52ff87ea9950fd782081d90aee9e973eab7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1805665Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#699023}

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.cc

@@ -16,6 +16,7 @@
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision.mojom.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler_utils.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder.h"
 #include "chrome/services/app_service/public/cpp/app_registry_cache.h"
@@ -25,17 +26,20 @@
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_constants.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 
 namespace chromeos {
 
 AddSupervisionHandler::AddSupervisionHandler(
-    add_supervision::mojom::AddSupervisionHandlerRequest request,
+    mojo::PendingReceiver<add_supervision::mojom::AddSupervisionHandler>
+        receiver,
     content::WebUI* web_ui,
     signin::IdentityManager* identity_manager,
     Delegate* delegate)
     : web_ui_(web_ui),
       identity_manager_(identity_manager),
-      binding_(this, std::move(request)),
+      receiver_(this, std::move(receiver)),
       delegate_(delegate) {}
 
 AddSupervisionHandler::~AddSupervisionHandler() = default;

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h

@@ -9,7 +9,8 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 
 namespace content {
 class WebUI;
@@ -39,7 +40,8 @@ class AddSupervisionHandler
 
   // |delegate| is owned by the caller and its lifetime must outlive |this|.
   AddSupervisionHandler(
-      add_supervision::mojom::AddSupervisionHandlerRequest request,
+      mojo::PendingReceiver<add_supervision::mojom::AddSupervisionHandler>
+          receiver,
       content::WebUI* web_ui,
       signin::IdentityManager* identity_manager,
       Delegate* delegate);
@@ -64,7 +66,7 @@ class AddSupervisionHandler
   signin::IdentityManager* identity_manager_;
   std::unique_ptr<signin::AccessTokenFetcher> oauth2_access_token_fetcher_;
 
-  mojo::Binding<add_supervision::mojom::AddSupervisionHandler> binding_;
+  mojo::Receiver<add_supervision::mojom::AddSupervisionHandler> receiver_;
 
   Delegate* delegate_;
 

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.cc

@@ -15,6 +15,7 @@
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/views/chrome_web_dialog_view.h"
+#include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision.mojom.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler_utils.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_metrics_recorder.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/confirm_signout_dialog.h"
@@ -24,7 +25,7 @@
 #include "components/google/core/common/google_util.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
@@ -160,14 +161,15 @@ void AddSupervisionUI::SetUpForTest(signin::IdentityManager* identity_manager) {
 }
 
 void AddSupervisionUI::BindAddSupervisionHandler(
-    add_supervision::mojom::AddSupervisionHandlerRequest request) {
+    mojo::PendingReceiver<add_supervision::mojom::AddSupervisionHandler>
+        receiver) {
   signin::IdentityManager* identity_manager =
       test_identity_manager_
           ? test_identity_manager_
           : IdentityManagerFactory::GetForProfile(Profile::FromWebUI(web_ui()));
 
   mojo_api_handler_ = std::make_unique<AddSupervisionHandler>(
-      std::move(request), web_ui(), identity_manager, this);
+      std::move(receiver), web_ui(), identity_manager, this);
 }
 
 void AddSupervisionUI::SetUpResources() {

chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_ui.h

@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision.mojom.h"
 #include "chrome/browser/ui/webui/chromeos/add_supervision/add_supervision_handler.h"
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/label.h"
@@ -68,7 +69,8 @@ class AddSupervisionUI : public ui::MojoWebUIController,
 
  private:
   void BindAddSupervisionHandler(
-      add_supervision::mojom::AddSupervisionHandlerRequest request);
+      mojo::PendingReceiver<add_supervision::mojom::AddSupervisionHandler>
+          receiver);
   void SetUpResources();
   GURL GetAddSupervisionURL();