Convert FakeBluetooth to new Mojo types

This CL converts FakeBluetoothRequest and FakeCentralRequest in
device to the new Mojo type, and uses pending_remote<FakeCentral>
in fake_bluetooth.mojom

Bug: 955171
Change-Id: I27a8887f998056f6913b1b53fe50e21165ca1018
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1788779Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694823}

device/bluetooth/public/mojom/test/fake_bluetooth.mojom

@@ -81,7 +81,8 @@ interface FakeBluetooth {
   SetLESupported(bool available) => ();
 
   // Initializes a fake Central with |state| as the initial state.
-  SimulateCentral(CentralState state) => (FakeCentral fake_central);
+  SimulateCentral(CentralState state) =>
+      (pending_remote<FakeCentral> fake_central);
 
   // Evaluates whether all responses set by this API have been consumed by this
   // central or otherwise.  This includes responses set by:

device/bluetooth/test/fake_bluetooth.cc

@@ -9,7 +9,8 @@
 #include "base/memory/ptr_util.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/public/mojom/test/fake_bluetooth.mojom.h"
-#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/self_owned_receiver.h"
 
 namespace bluetooth {
 
@@ -21,9 +22,10 @@ FakeBluetooth::FakeBluetooth()
 FakeBluetooth::~FakeBluetooth() = default;
 
 // static
-void FakeBluetooth::Create(mojom::FakeBluetoothRequest request) {
-  mojo::MakeStrongBinding(std::make_unique<FakeBluetooth>(),
-                          std::move(request));
+void FakeBluetooth::Create(
+    mojo::PendingReceiver<mojom::FakeBluetooth> receiver) {
+  mojo::MakeSelfOwnedReceiver(std::make_unique<FakeBluetooth>(),
+                              std::move(receiver));
 }
 
 void FakeBluetooth::SetLESupported(bool supported,
@@ -34,11 +36,11 @@ void FakeBluetooth::SetLESupported(bool supported,
 
 void FakeBluetooth::SimulateCentral(mojom::CentralState state,
                                     SimulateCentralCallback callback) {
-  mojom::FakeCentralPtr fake_central_ptr;
+  mojo::PendingRemote<mojom::FakeCentral> fake_central;
   fake_central_ = base::MakeRefCounted<FakeCentral>(
-      state, mojo::MakeRequest(&fake_central_ptr));
+      state, fake_central.InitWithNewPipeAndPassReceiver());
   device::BluetoothAdapterFactory::SetAdapterForTesting(fake_central_);
-  std::move(callback).Run(std::move(fake_central_ptr));
+  std::move(callback).Run(std::move(fake_central));
 }
 
 void FakeBluetooth::AllResponsesConsumed(

device/bluetooth/test/fake_bluetooth.h

@@ -10,6 +10,7 @@
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/public/mojom/test/fake_bluetooth.mojom.h"
 #include "device/bluetooth/test/fake_central.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 
 namespace bluetooth {
 
@@ -24,7 +25,7 @@ class FakeBluetooth : public mojom::FakeBluetooth {
   FakeBluetooth();
   ~FakeBluetooth() override;
 
-  static void Create(mojom::FakeBluetoothRequest request);
+  static void Create(mojo::PendingReceiver<mojom::FakeBluetooth> receiver);
 
   void SetLESupported(bool available, SetLESupportedCallback callback) override;
   void SimulateCentral(mojom::CentralState state,

device/bluetooth/test/fake_central.cc

@@ -39,8 +39,8 @@ device::BluetoothDevice::ManufacturerDataMap ToManufacturerDataMap(
 }  // namespace
 
 FakeCentral::FakeCentral(mojom::CentralState state,
-                         mojom::FakeCentralRequest request)
-    : state_(state), binding_(this, std::move(request)) {}
+                         mojo::PendingReceiver<mojom::FakeCentral> receiver)
+    : state_(state), receiver_(this, std::move(receiver)) {}
 
 void FakeCentral::SimulatePreconnectedPeripheral(
     const std::string& address,

device/bluetooth/test/fake_central.h

@@ -11,7 +11,8 @@
 #include "base/compiler_specific.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/public/mojom/test/fake_bluetooth.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 bluetooth {
 
@@ -28,7 +29,8 @@ class FakeRemoteGattService;
 // Not intended for direct use by clients.  See README.md.
 class FakeCentral : public mojom::FakeCentral, public device::BluetoothAdapter {
  public:
-  FakeCentral(mojom::CentralState state, mojom::FakeCentralRequest request);
+  FakeCentral(mojom::CentralState state,
+              mojo::PendingReceiver<mojom::FakeCentral> receiver);
 
   // FakeCentral overrides:
   void SimulatePreconnectedPeripheral(
@@ -211,7 +213,7 @@ class FakeCentral : public mojom::FakeCentral, public device::BluetoothAdapter {
       const std::string& descriptor_id) const;
 
   mojom::CentralState state_;
-  mojo::Binding<mojom::FakeCentral> binding_;
+  mojo::Receiver<mojom::FakeCentral> receiver_;
 };
 
 }  // namespace bluetooth