Convert CellularSetup to new Mojo types

This CL converts CellularSetup from cellular_setup.mojom
to new Mojo types using PendingRemote, ReceiverSet,
and Remote.

Bug: 955171
Change-Id: I8d87490e32c5ef1228fc6db1ddd73324b98a5f2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1872214
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708899}

chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog.cc

@@ -39,7 +39,7 @@ class CellularSetupServiceHolder : public base::SupportsUserData::Data {
   ~CellularSetupServiceHolder() override = default;
 
   void BindReceiver(mojo::PendingReceiver<mojom::CellularSetup> receiver) {
-    service_.BindRequest(std::move(receiver));
+    service_.BindReceiver(std::move(receiver));
   }
 
  private:
@@ -132,9 +132,9 @@ CellularSetupDialogUI::CellularSetupDialogUI(content::WebUI* web_ui)
 CellularSetupDialogUI::~CellularSetupDialogUI() = default;
 
 void CellularSetupDialogUI::BindCellularSetup(
-    mojom::CellularSetupRequest request) {
+    mojo::PendingReceiver<mojom::CellularSetup> receiver) {
   GetOrCreateServiceHolder(web_ui()->GetWebContents()->GetBrowserContext())
-      ->BindReceiver(std::move(request));
+      ->BindReceiver(std::move(receiver));
 }
 
 }  // namespace cellular_setup

chrome/browser/ui/webui/chromeos/cellular_setup/cellular_setup_dialog.h

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "chrome/browser/ui/webui/chromeos/system_web_dialog_delegate.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
 namespace chromeos {
@@ -40,7 +41,7 @@ class CellularSetupDialogUI : public ui::MojoWebDialogUI {
   ~CellularSetupDialogUI() override;
 
  private:
-  void BindCellularSetup(mojom::CellularSetupRequest request);
+  void BindCellularSetup(mojo::PendingReceiver<mojom::CellularSetup> receiver);
 
   DISALLOW_COPY_AND_ASSIGN(CellularSetupDialogUI);
 };

chromeos/services/cellular_setup/cellular_setup_base.cc

@@ -12,8 +12,9 @@ CellularSetupBase::CellularSetupBase() = default;
 
 CellularSetupBase::~CellularSetupBase() = default;
 
-void CellularSetupBase::BindRequest(mojom::CellularSetupRequest request) {
-  bindings_.AddBinding(this, std::move(request));
+void CellularSetupBase::BindReceiver(
+    mojo::PendingReceiver<mojom::CellularSetup> receiver) {
+  receivers_.Add(this, std::move(receiver));
 }
 
 }  // namespace cellular_setup

chromeos/services/cellular_setup/cellular_setup_base.h

@@ -7,26 +7,27 @@
 
 #include "base/macros.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "mojo/public/cpp/bindings/receiver_set.h"
 
 namespace chromeos {
 
 namespace cellular_setup {
 
-// mojom::CellularSetup implementation which accepts requests to bind to it.
+// mojom::CellularSetup implementation which accepts receivers to bind to it.
 // This class does not implement any of mojom::CellularSetup's functions, so
 // derived classes should override them.
 class CellularSetupBase : public mojom::CellularSetup {
  public:
   ~CellularSetupBase() override;
 
-  void BindRequest(mojom::CellularSetupRequest request);
+  void BindReceiver(mojo::PendingReceiver<mojom::CellularSetup> receiver);
 
  protected:
   CellularSetupBase();
 
  private:
-  mojo::BindingSet<mojom::CellularSetup> bindings_;
+  mojo::ReceiverSet<mojom::CellularSetup> receivers_;
 
   DISALLOW_COPY_AND_ASSIGN(CellularSetupBase);
 };

chromeos/services/cellular_setup/cellular_setup_service_unittest.cc

@@ -46,8 +46,8 @@ class CellularSetupServiceTest : public testing::Test {
   // testing::Test:
   void SetUp() override {
     service_ = std::make_unique<FakeCellularSetup>();
-    service_->BindRequest(mojo::MakeRequest(&cellular_setup_ptr_));
-    cellular_setup_ptr_.FlushForTesting();
+    service_->BindReceiver(cellular_setup_remote_.BindNewPipeAndPassReceiver());
+    cellular_setup_remote_.FlushForTesting();
   }
 
   // Calls StartActivation() and returns the fake CarrierPortalHandler and its
@@ -61,11 +61,11 @@ class CellularSetupServiceTest : public testing::Test {
     base::RunLoop run_loop;
 
     // Make StartActivation() call and propagate it to the service.
-    cellular_setup_ptr_->StartActivation(
+    cellular_setup_remote_->StartActivation(
         fake_activation_delegate->GenerateRemote(),
         base::BindOnce(&CellularSetupServiceTest::OnStartActivationResult,
                        base::Unretained(this), run_loop.QuitClosure()));
-    cellular_setup_ptr_.FlushForTesting();
+    cellular_setup_remote_.FlushForTesting();
 
     // Verify that the call was made successfully.
     EXPECT_EQ(num_args_before_call + 1u, start_activation_invocations.size());
@@ -166,7 +166,7 @@ class CellularSetupServiceTest : public testing::Test {
 
   mojo::Remote<mojom::CarrierPortalHandler> last_carrier_portal_observer_;
 
-  mojom::CellularSetupPtr cellular_setup_ptr_;
+  mojo::Remote<mojom::CellularSetup> cellular_setup_remote_;
 
   DISALLOW_COPY_AND_ASSIGN(CellularSetupServiceTest);
 };