Convert mojom::MessageReceiver to new Mojo types

This CL converts MessageReceiverPtr, MessageReceiverRequest to
new Mojo types using PendingRemote or Remote, PendingReceiver,
and Receiver.

It also updates OnConnection from secure_channel.mojom.

Bug: 955171
Change-Id: Id630cb964ad03f439b696e93182bc29b13fa689d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1820777
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699734}

chromeos/services/secure_channel/client_connection_parameters.cc

@@ -40,12 +40,12 @@ void ClientConnectionParameters::SetConnectionAttemptFailed(
 
 void ClientConnectionParameters::SetConnectionSucceeded(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   static const std::string kFunctionName = "SetConnectionSucceeded";
   VerifyDelegateWaitingForResponse(kFunctionName);
   has_invoked_delegate_function_ = true;
   PerformSetConnectionSucceeded(std::move(channel),
-                                std::move(message_receiver_request));
+                                std::move(message_receiver_receiver));
 }
 
 bool ClientConnectionParameters::operator==(

chromeos/services/secure_channel/client_connection_parameters.h

@@ -12,6 +12,7 @@
 #include "base/observer_list.h"
 #include "base/unguessable_token.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 
 namespace chromeos {
@@ -49,12 +50,12 @@ class ClientConnectionParameters {
   void SetConnectionAttemptFailed(mojom::ConnectionAttemptFailureReason reason);
 
   // Alerts the client that the connection has succeeded, providing the client
-  // with a Channel and a request to bind a MessageReceiver. This function can
+  // with a Channel and a receiver to bind a MessageReceiver. This function can
   // only be called if IsActive() is true and SetConnectionAttemptFailed() has
   // not been invoked.
   void SetConnectionSucceeded(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request);
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver);
 
   bool operator==(const ClientConnectionParameters& other) const;
   bool operator<(const ClientConnectionParameters& other) const;
@@ -65,7 +66,8 @@ class ClientConnectionParameters {
       mojom::ConnectionAttemptFailureReason reason) = 0;
   virtual void PerformSetConnectionSucceeded(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) = 0;
+      mojo::PendingReceiver<mojom::MessageReceiver>
+          message_receiver_receiver) = 0;
 
   void NotifyConnectionRequestCanceled();
 

chromeos/services/secure_channel/client_connection_parameters_impl.cc

@@ -67,9 +67,9 @@ void ClientConnectionParametersImpl::PerformSetConnectionAttemptFailed(
 
 void ClientConnectionParametersImpl::PerformSetConnectionSucceeded(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   connection_delegate_ptr_->OnConnection(std::move(channel),
-                                         std::move(message_receiver_request));
+                                         std::move(message_receiver_receiver));
 }
 
 void ClientConnectionParametersImpl::OnConnectionDelegatePtrDisconnected() {

chromeos/services/secure_channel/client_connection_parameters_impl.h

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "chromeos/services/secure_channel/client_connection_parameters.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 
 namespace chromeos {
@@ -44,7 +45,8 @@ class ClientConnectionParametersImpl : public ClientConnectionParameters {
       mojom::ConnectionAttemptFailureReason reason) override;
   void PerformSetConnectionSucceeded(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override;
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver)
+      override;
 
   void OnConnectionDelegatePtrDisconnected();
 

chromeos/services/secure_channel/client_connection_parameters_impl_unittest.cc

@@ -55,12 +55,12 @@ class SecureChannelClientConnectionParametersImplTest : public testing::Test {
 
   void CallOnConnection(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) {
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
     base::RunLoop run_loop;
     fake_connection_delegate_->set_closure_for_next_delegate_callback(
         run_loop.QuitClosure());
     client_connection_parameters_->SetConnectionSucceeded(
-        std::move(channel), std::move(message_receiver_request));
+        std::move(channel), std::move(message_receiver_receiver));
     run_loop.Run();
   }
 
@@ -107,15 +107,15 @@ TEST_F(SecureChannelClientConnectionParametersImplTest,
 
 TEST_F(SecureChannelClientConnectionParametersImplTest, OnConnection) {
   auto fake_channel = std::make_unique<FakeChannel>();
-  mojom::MessageReceiverPtr message_receiver_ptr;
+  mojo::PendingRemote<mojom::MessageReceiver> message_receiver_remote;
 
   CallOnConnection(fake_channel->GenerateRemote(),
-                   mojo::MakeRequest(&message_receiver_ptr));
+                   message_receiver_remote.InitWithNewPipeAndPassReceiver());
   VerifyStatus(false /* expected_to_be_waiting_for_response */,
                false /* expected_to_be_canceled */);
 
   EXPECT_TRUE(fake_connection_delegate()->channel());
-  EXPECT_TRUE(fake_connection_delegate()->message_receiver_request());
+  EXPECT_TRUE(fake_connection_delegate()->message_receiver_receiver());
 }
 
 TEST_F(SecureChannelClientConnectionParametersImplTest, OnConnectionFailed) {

chromeos/services/secure_channel/fake_client_connection_parameters.cc

@@ -37,18 +37,18 @@ void FakeClientConnectionParameters::PerformSetConnectionAttemptFailed(
 
 void FakeClientConnectionParameters::PerformSetConnectionSucceeded(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   DCHECK(message_receiver_);
-  DCHECK(!message_receiver_binding_);
+  DCHECK(!message_receiver_receiver_);
 
   channel_.Bind(std::move(channel));
   channel_.set_disconnect_with_reason_handler(
       base::BindOnce(&FakeClientConnectionParameters::OnChannelDisconnected,
                      weak_ptr_factory_.GetWeakPtr()));
 
-  message_receiver_binding_ =
-      std::make_unique<mojo::Binding<mojom::MessageReceiver>>(
-          message_receiver_.get(), std::move(message_receiver_request));
+  message_receiver_receiver_ =
+      std::make_unique<mojo::Receiver<mojom::MessageReceiver>>(
+          message_receiver_.get(), std::move(message_receiver_receiver));
 }
 
 void FakeClientConnectionParameters::OnChannelDisconnected(

chromeos/services/secure_channel/fake_client_connection_parameters.h

@@ -10,8 +10,9 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/secure_channel/client_connection_parameters.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
 namespace chromeos {
@@ -53,7 +54,8 @@ class FakeClientConnectionParameters : public ClientConnectionParameters {
       mojom::ConnectionAttemptFailureReason reason) override;
   void PerformSetConnectionSucceeded(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override;
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver)
+      override;
 
   void OnChannelDisconnected(uint32_t disconnection_reason,
                              const std::string& disconnection_description);
@@ -61,8 +63,8 @@ class FakeClientConnectionParameters : public ClientConnectionParameters {
   bool has_canceled_client_request_ = false;
 
   std::unique_ptr<mojom::MessageReceiver> message_receiver_;
-  std::unique_ptr<mojo::Binding<mojom::MessageReceiver>>
-      message_receiver_binding_;
+  std::unique_ptr<mojo::Receiver<mojom::MessageReceiver>>
+      message_receiver_receiver_;
 
   base::Optional<mojom::ConnectionAttemptFailureReason> failure_reason_;
 

chromeos/services/secure_channel/fake_connection_delegate.cc

@@ -35,9 +35,9 @@ void FakeConnectionDelegate::OnConnectionAttemptFailure(
 
 void FakeConnectionDelegate::OnConnection(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   channel_.Bind(std::move(channel));
-  message_receiver_request_ = std::move(message_receiver_request);
+  message_receiver_receiver_ = std::move(message_receiver_receiver);
 
   if (closure_for_next_delegate_callback_)
     std::move(closure_for_next_delegate_callback_).Run();

chromeos/services/secure_channel/fake_connection_delegate.h

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
@@ -35,18 +36,18 @@ class FakeConnectionDelegate : public mojom::ConnectionDelegate {
 
   const mojo::Remote<mojom::Channel>& channel() const { return channel_; }
 
-  const base::Optional<mojom::MessageReceiverRequest>&
-  message_receiver_request() const {
-    return message_receiver_request_;
+  const mojo::PendingReceiver<mojom::MessageReceiver>&
+  message_receiver_receiver() const {
+    return message_receiver_receiver_;
   }
 
  private:
   // mojom::ConnectionDelegate:
   void OnConnectionAttemptFailure(
       mojom::ConnectionAttemptFailureReason reason) override;
-  void OnConnection(
-      mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override;
+  void OnConnection(mojo::PendingRemote<mojom::Channel> channel,
+                    mojo::PendingReceiver<mojom::MessageReceiver>
+                        message_receiver_receiver) override;
 
   void OnChannelDisconnected(uint32_t disconnection_reason,
                              const std::string& disconnection_description);
@@ -57,7 +58,7 @@ class FakeConnectionDelegate : public mojom::ConnectionDelegate {
   base::Optional<mojom::ConnectionAttemptFailureReason>
       connection_attempt_failure_reason_;
   mojo::Remote<mojom::Channel> channel_;
-  base::Optional<mojom::MessageReceiverRequest> message_receiver_request_;
+  mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeConnectionDelegate);
 };

chromeos/services/secure_channel/public/cpp/client/client_channel_impl.cc

@@ -33,16 +33,16 @@ ClientChannelImpl::Factory::~Factory() = default;
 
 std::unique_ptr<ClientChannel> ClientChannelImpl::Factory::BuildInstance(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   return base::WrapUnique(new ClientChannelImpl(
-      std::move(channel), std::move(message_receiver_request)));
+      std::move(channel), std::move(message_receiver_receiver)));
 }
 
 ClientChannelImpl::ClientChannelImpl(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request)
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver)
     : channel_(std::move(channel)),
-      binding_(this, std::move(message_receiver_request)) {
+      receiver_(this, std::move(message_receiver_receiver)) {
   channel_.set_disconnect_with_reason_handler(
       base::BindOnce(&ClientChannelImpl::OnChannelDisconnected,
                      weak_ptr_factory_.GetWeakPtr()));
@@ -81,7 +81,7 @@ void ClientChannelImpl::OnChannelDisconnected(
   }
 
   channel_.reset();
-  binding_.Close();
+  receiver_.reset();
   NotifyDisconnected();
 }
 

chromeos/services/secure_channel/public/cpp/client/client_channel_impl.h

@@ -9,8 +9,9 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/secure_channel/public/cpp/client/client_channel.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
+#include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
 namespace chromeos {
@@ -27,7 +28,8 @@ class ClientChannelImpl : public ClientChannel, public mojom::MessageReceiver {
     virtual ~Factory();
     virtual std::unique_ptr<ClientChannel> BuildInstance(
         mojo::PendingRemote<mojom::Channel> channel,
-        mojom::MessageReceiverRequest message_receiver_request);
+        mojo::PendingReceiver<mojom::MessageReceiver>
+            message_receiver_receiver);
 
    private:
     static Factory* test_factory_;
@@ -38,8 +40,9 @@ class ClientChannelImpl : public ClientChannel, public mojom::MessageReceiver {
  private:
   friend class SecureChannelClientChannelImplTest;
 
-  ClientChannelImpl(mojo::PendingRemote<mojom::Channel> channel,
-                    mojom::MessageReceiverRequest message_receiver_request);
+  ClientChannelImpl(
+      mojo::PendingRemote<mojom::Channel> channel,
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver);
 
   // ClientChannel:
   void PerformGetConnectionMetadata(
@@ -60,7 +63,7 @@ class ClientChannelImpl : public ClientChannel, public mojom::MessageReceiver {
   void FlushForTesting();
 
   mojo::Remote<mojom::Channel> channel_;
-  mojo::Binding<mojom::MessageReceiver> binding_;
+  mojo::Receiver<mojom::MessageReceiver> receiver_;
 
   base::WeakPtrFactory<ClientChannelImpl> weak_ptr_factory_{this};
 

chromeos/services/secure_channel/public/cpp/client/client_channel_impl_unittest.cc

@@ -41,7 +41,7 @@ class SecureChannelClientChannelImplTest : public testing::Test {
 
     client_channel_ = ClientChannelImpl::Factory::Get()->BuildInstance(
         fake_channel_->GenerateRemote(),
-        mojo::MakeRequest(&message_receiver_ptr_));
+        message_receiver_remote_.BindNewPipeAndPassReceiver());
 
     fake_observer_ = std::make_unique<FakeClientChannelObserver>();
     client_channel_->AddObserver(fake_observer_.get());
@@ -99,7 +99,7 @@ class SecureChannelClientChannelImplTest : public testing::Test {
   base::test::TaskEnvironment task_environment_;
 
   std::unique_ptr<FakeChannel> fake_channel_;
-  mojom::MessageReceiverPtr message_receiver_ptr_;
+  mojo::Remote<mojom::MessageReceiver> message_receiver_remote_;
   std::unique_ptr<FakeClientChannelObserver> fake_observer_;
 
   mojom::ConnectionMetadataPtr connection_metadata_;
@@ -159,8 +159,8 @@ TEST_F(SecureChannelClientChannelImplTest, TestSendMessage) {
 }
 
 TEST_F(SecureChannelClientChannelImplTest, TestReceiveMessage) {
-  message_receiver_ptr_->OnMessageReceived("payload");
-  message_receiver_ptr_.FlushForTesting();
+  message_receiver_remote_->OnMessageReceived("payload");
+  message_receiver_remote_.FlushForTesting();
 
   EXPECT_EQ(1u, fake_observer_->received_messages().size());
   EXPECT_EQ("payload", fake_observer_->received_messages()[0]);

chromeos/services/secure_channel/public/cpp/client/connection_attempt_impl.cc

@@ -55,9 +55,9 @@ void ConnectionAttemptImpl::OnConnectionAttemptFailure(
 
 void ConnectionAttemptImpl::OnConnection(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   NotifyConnection(ClientChannelImpl::Factory::Get()->BuildInstance(
-      std::move(channel), std::move(message_receiver_request)));
+      std::move(channel), std::move(message_receiver_receiver)));
 }
 
 }  // namespace secure_channel

chromeos/services/secure_channel/public/cpp/client/connection_attempt_impl.h

@@ -9,6 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/secure_channel/public/cpp/client/connection_attempt.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 
 namespace chromeos {
@@ -40,9 +41,9 @@ class ConnectionAttemptImpl : public ConnectionAttempt,
   // mojom::ConnectionDelegate:
   void OnConnectionAttemptFailure(
       mojom::ConnectionAttemptFailureReason reason) override;
-  void OnConnection(
-      mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override;
+  void OnConnection(mojo::PendingRemote<mojom::Channel> channel,
+                    mojo::PendingReceiver<mojom::MessageReceiver>
+                        message_receiver_receiver) override;
 
  private:
   mojo::Binding<mojom::ConnectionDelegate> binding_;

chromeos/services/secure_channel/public/cpp/client/fake_connection_attempt.cc

@@ -20,9 +20,9 @@ void FakeConnectionAttempt::OnConnectionAttemptFailure(
 
 void FakeConnectionAttempt::OnConnection(
     mojo::PendingRemote<mojom::Channel> channel,
-    mojom::MessageReceiverRequest message_receiver_request) {
+    mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver) {
   ConnectionAttemptImpl::OnConnection(std::move(channel),
-                                      std::move(message_receiver_request));
+                                      std::move(message_receiver_receiver));
   std::move(on_connection_callback_).Run();
 }
 

chromeos/services/secure_channel/public/cpp/client/fake_connection_attempt.h

@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/services/secure_channel/public/cpp/client/connection_attempt_impl.h"
+#include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 
 namespace chromeos {
@@ -26,9 +27,9 @@ class FakeConnectionAttempt : public ConnectionAttemptImpl {
   // ConnectionAttemptImpl:
   void OnConnectionAttemptFailure(
       mojom::ConnectionAttemptFailureReason reason) override;
-  void OnConnection(
-      mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override;
+  void OnConnection(mojo::PendingRemote<mojom::Channel> channel,
+                    mojo::PendingReceiver<mojom::MessageReceiver>
+                        message_receiver_receiver) override;
 
   void set_on_connection_attempt_failure_callback(base::OnceClosure callback) {
     on_connection_attempt_failure_callback_ = std::move(callback);

chromeos/services/secure_channel/public/cpp/client/secure_channel_client_impl_unittest.cc

@@ -75,7 +75,8 @@ class FakeClientChannelImplFactory : public ClientChannelImpl::Factory {
   // ClientChannelImpl::Factory:
   std::unique_ptr<ClientChannel> BuildInstance(
       mojo::PendingRemote<mojom::Channel> channel,
-      mojom::MessageReceiverRequest message_receiver_request) override {
+      mojo::PendingReceiver<mojom::MessageReceiver> message_receiver_receiver)
+      override {
     auto client_channel = std::make_unique<FakeClientChannel>();
     last_client_channel_created_ = client_channel.get();
     return client_channel;
@@ -233,10 +234,11 @@ TEST_F(SecureChannelClientImplTest, TestInitiateConnectionToDevice) {
   fake_connection_attempt->set_on_connection_callback(run_loop.QuitClosure());
 
   auto fake_channel = std::make_unique<FakeChannel>();
-  mojom::MessageReceiverPtr message_receiver_ptr;
+  mojo::PendingRemote<mojom::MessageReceiver> message_receiver_remote;
 
   fake_secure_channel_->delegate_from_last_initiate_call()->OnConnection(
-      fake_channel->GenerateRemote(), mojo::MakeRequest(&message_receiver_ptr));
+      fake_channel->GenerateRemote(),
+      message_receiver_remote.InitWithNewPipeAndPassReceiver());
 
   run_loop.Run();
 
@@ -275,10 +277,11 @@ TEST_F(SecureChannelClientImplTest, TestListenForConnectionFromDevice) {
   fake_connection_attempt->set_on_connection_callback(run_loop.QuitClosure());
 
   auto fake_channel = std::make_unique<FakeChannel>();
-  mojom::MessageReceiverPtr message_receiver_ptr;
+  mojo::PendingRemote<mojom::MessageReceiver> message_receiver_remote;
 
   fake_secure_channel_->delegate_from_last_listen_call()->OnConnection(
-      fake_channel->GenerateRemote(), mojo::MakeRequest(&message_receiver_ptr));
+      fake_channel->GenerateRemote(),
+      message_receiver_remote.InitWithNewPipeAndPassReceiver());
 
   run_loop.Run();
 
@@ -315,10 +318,10 @@ TEST_F(SecureChannelClientImplTest, TestMultipleConnections) {
   fake_connection_attempt_1->set_on_connection_callback(
       run_loop_1.QuitClosure());
   auto fake_channel_1 = std::make_unique<FakeChannel>();
-  mojom::MessageReceiverPtr message_receiver_ptr_1;
+  mojo::PendingRemote<mojom::MessageReceiver> message_receiver_remote_1;
   fake_secure_channel_->delegate_from_last_initiate_call()->OnConnection(
       fake_channel_1->GenerateRemote(),
-      mojo::MakeRequest(&message_receiver_ptr_1));
+      message_receiver_remote_1.InitWithNewPipeAndPassReceiver());
   run_loop_1.Run();
 
   ClientChannel* client_channel_1 =
@@ -333,10 +336,10 @@ TEST_F(SecureChannelClientImplTest, TestMultipleConnections) {
   fake_connection_attempt_2->set_on_connection_callback(
       run_loop_2.QuitClosure());
   auto fake_channel_2 = std::make_unique<FakeChannel>();
-  mojom::MessageReceiverPtr message_receiver_ptr_2;
+  mojo::PendingRemote<mojom::MessageReceiver> message_receiver_remote_2;
   fake_secure_channel_->delegate_from_last_listen_call()->OnConnection(
       fake_channel_2->GenerateRemote(),
-      mojo::MakeRequest(&message_receiver_ptr_2));
+      message_receiver_remote_2.InitWithNewPipeAndPassReceiver());
   run_loop_2.Run();
 
   ClientChannel* client_channel_2 =

chromeos/services/secure_channel/public/mojom/secure_channel.mojom

@@ -135,7 +135,7 @@ interface ConnectionDelegate {
   // connection. Note that clients are expected to hold the reference to
   // |channel| until they are done using the connection.
   OnConnection(pending_remote<Channel> channel,
-               MessageReceiver& message_receiver);
+               pending_receiver<MessageReceiver> message_receiver_receiver);
 };
 
 // Brokers connections between the current Chromebook and remote devices,

chromeos/services/secure_channel/single_client_message_proxy_impl.cc

@@ -48,7 +48,8 @@ SingleClientMessageProxyImpl::SingleClientMessageProxyImpl(
       channel_(std::make_unique<ChannelImpl>(this /* delegate */)) {
   DCHECK(client_connection_parameters_);
   client_connection_parameters_->SetConnectionSucceeded(
-      channel_->GenerateRemote(), mojo::MakeRequest(&message_receiver_ptr_));
+      channel_->GenerateRemote(),
+      message_receiver_remote_.BindNewPipeAndPassReceiver());
 }
 
 SingleClientMessageProxyImpl::~SingleClientMessageProxyImpl() = default;
@@ -64,7 +65,7 @@ void SingleClientMessageProxyImpl::HandleReceivedMessage(
   if (feature != client_connection_parameters_->feature())
     return;
 
-  message_receiver_ptr_->OnMessageReceived(payload);
+  message_receiver_remote_->OnMessageReceived(payload);
 }
 
 void SingleClientMessageProxyImpl::HandleRemoteDeviceDisconnection() {
@@ -88,8 +89,8 @@ void SingleClientMessageProxyImpl::OnClientDisconnected() {
 }
 
 void SingleClientMessageProxyImpl::FlushForTesting() {
-  DCHECK(message_receiver_ptr_);
-  message_receiver_ptr_.FlushForTesting();
+  DCHECK(message_receiver_remote_);
+  message_receiver_remote_.FlushForTesting();
 }
 
 }  // namespace secure_channel

chromeos/services/secure_channel/single_client_message_proxy_impl.h

@@ -12,14 +12,14 @@
 #include "chromeos/services/secure_channel/client_connection_parameters.h"
 #include "chromeos/services/secure_channel/public/mojom/secure_channel.mojom.h"
 #include "chromeos/services/secure_channel/single_client_message_proxy.h"
-#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/cpp/bindings/remote.h"
 
 namespace chromeos {
 
 namespace secure_channel {
 
 // Concrete SingleClientMessageProxy implementation, which utilizes a
-// ChannelImpl and MessageReceiverPtr to send/receive messages.
+// ChannelImpl and mojo::Remote<MessageReceiver> to send/receive messages.
 class SingleClientMessageProxyImpl : public SingleClientMessageProxy,
                                      public ChannelImpl::Delegate {
  public:
@@ -65,7 +65,7 @@ class SingleClientMessageProxyImpl : public SingleClientMessageProxy,
 
   std::unique_ptr<ClientConnectionParameters> client_connection_parameters_;
   std::unique_ptr<ChannelImpl> channel_;
-  mojom::MessageReceiverPtr message_receiver_ptr_;
+  mojo::Remote<mojom::MessageReceiver> message_receiver_remote_;
 
   DISALLOW_COPY_AND_ASSIGN(SingleClientMessageProxyImpl);
 };