Migrate MediaRouter::OnMediaRemoterCreated to new Mojo types

OnMediaRemoterCreated has still been using old Mojo types.
This CL applies pending_remote and pending_receiver to
the function.

Bug: 955171
Change-Id: Iefbf6465dfd43940f4f0a9c46c28a1f4f2012ddb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1829633Reviewed-by: Tommi <tommi@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#706333}

chrome/browser/media/cast_remoting_connector.cc

@@ -192,7 +192,6 @@ CastRemotingConnector::CastRemotingConnector(
       tab_id_(tab_id),
       permission_request_callback_(std::move(permission_request_callback)),
       active_bridge_(nullptr),
-      deprecated_binding_(this),
       pref_service_(pref_service) {
   DCHECK(permission_request_callback_);
 #if !defined(OS_ANDROID)
@@ -224,18 +223,18 @@ CastRemotingConnector::~CastRemotingConnector() {
 }
 
 void CastRemotingConnector::ConnectToService(
-    media::mojom::MirrorServiceRemotingSourceRequest source_request,
-    media::mojom::MirrorServiceRemoterPtr remoter) {
-  DCHECK(!deprecated_binding_);
+    mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+        source_receiver,
+    mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter) {
   DCHECK(!deprecated_remoter_);
   DCHECK(remoter);
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  deprecated_binding_.Bind(std::move(source_request));
-  deprecated_binding_.set_connection_error_handler(base::BindOnce(
+  deprecated_receiver_.Bind(std::move(source_receiver));
+  deprecated_receiver_.set_disconnect_handler(base::BindOnce(
       &CastRemotingConnector::OnMirrorServiceStopped, base::Unretained(this)));
-  deprecated_remoter_ = std::move(remoter);
-  deprecated_remoter_.set_connection_error_handler(base::BindOnce(
+  deprecated_remoter_.Bind(std::move(remoter));
+  deprecated_remoter_.set_disconnect_handler(base::BindOnce(
       &CastRemotingConnector::OnMirrorServiceStopped, base::Unretained(this)));
 }
 
@@ -263,8 +262,7 @@ void CastRemotingConnector::OnMirrorServiceStopped() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DVLOG(2) << __func__;
 
-  if (deprecated_binding_)
-    deprecated_binding_.Close();
+  deprecated_receiver_.reset();
   deprecated_remoter_.reset();
   receiver_.reset();
   remoter_.reset();

chrome/browser/media/cast_remoting_connector.h

@@ -16,7 +16,8 @@
 #include "media/mojo/mojom/mirror_service_remoting.mojom.h"
 #include "media/mojo/mojom/remoting.mojom.h"
 #include "media/mojo/mojom/remoting_common.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"
 
@@ -100,8 +101,9 @@ class CastRemotingConnector : public base::SupportsUserData::Data,
   // call connects the CastRemotingConnector with the MediaRemoter. Remoting
   // sessions can only be started after this is called.
   void ConnectToService(
-      media::mojom::MirrorServiceRemotingSourceRequest source_request,
-      media::mojom::MirrorServiceRemoterPtr remoter);
+      mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+          source_receiver,
+      mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter);
 
   // Called at the start of mirroring to reset the permission.
   void ResetRemotingPermission();
@@ -234,8 +236,9 @@ class CastRemotingConnector : public base::SupportsUserData::Data,
   RemotingBridge* active_bridge_;
 
   // TODO(xjz): Remove these after Mirroring Service is launched.
-  mojo::Binding<media::mojom::MirrorServiceRemotingSource> deprecated_binding_;
-  media::mojom::MirrorServiceRemoterPtr deprecated_remoter_;
+  mojo::Receiver<media::mojom::MirrorServiceRemotingSource>
+      deprecated_receiver_{this};
+  mojo::Remote<media::mojom::MirrorServiceRemoter> deprecated_remoter_;
 
   mojo::Receiver<media::mojom::RemotingSource> receiver_{this};
   mojo::Remote<media::mojom::Remoter> remoter_;

chrome/browser/media/cast_remoting_connector_unittest.cc

@@ -21,7 +21,10 @@
 #include "content/public/test/browser_task_environment.h"
 #include "media/mojo/mojom/mirror_service_remoting.mojom.h"
 #include "media/mojo/mojom/remoting.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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -81,8 +84,9 @@ class FakeMediaRouter : public media_router::MockMediaRouter {
 
   void OnMediaRemoterCreated(
       SessionID tab_id,
-      MirrorServiceRemoterPtr remoter,
-      MirrorServiceRemotingSourceRequest remoting_source) {
+      mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter,
+      mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+          remoting_source) {
     if (tab_id != tab_id_)
       return;
 
@@ -130,16 +134,15 @@ class MockMediaRemoter final : public media::mojom::MirrorServiceRemoter,
                                public media::mojom::Remoter {
  public:
   // TODO(xjz): Remove this ctor after Mirroring Service is launched.
-  explicit MockMediaRemoter(FakeMediaRouter* media_router)
-      : deprecated_binding_(this) {
-    MirrorServiceRemoterPtr remoter;
-    deprecated_binding_.Bind(mojo::MakeRequest(&remoter));
-    media_router->OnMediaRemoterCreated(kRemotingTabId, std::move(remoter),
-                                        mojo::MakeRequest(&deprecated_source_));
+  explicit MockMediaRemoter(FakeMediaRouter* media_router) {
+    mojo::PendingRemote<media::mojom::MirrorServiceRemoter> pending_remoter;
+    deprecated_receiver_.Bind(pending_remoter.InitWithNewPipeAndPassReceiver());
+    media_router->OnMediaRemoterCreated(
+        kRemotingTabId, std::move(pending_remoter),
+        deprecated_source_.BindNewPipeAndPassReceiver());
   }
 
-  explicit MockMediaRemoter(CastRemotingConnector* connector)
-      : deprecated_binding_(this) {
+  explicit MockMediaRemoter(CastRemotingConnector* connector) {
     connector->ConnectWithMediaRemoter(receiver_.BindNewPipeAndPassRemote(),
                                        mojo::MakeRequest(&source_));
   }
@@ -217,8 +220,8 @@ class MockMediaRemoter final : public media::mojom::MirrorServiceRemoter,
 
  private:
   // TODO(xjz): Remove these after Mirroring Service is launched.
-  mojo::Binding<media::mojom::MirrorServiceRemoter> deprecated_binding_;
-  MirrorServiceRemotingSourcePtr deprecated_source_;
+  mojo::Receiver<media::mojom::MirrorServiceRemoter> deprecated_receiver_{this};
+  mojo::Remote<media::mojom::MirrorServiceRemotingSource> deprecated_source_;
 
   mojo::Receiver<media::mojom::Remoter> receiver_{this};
   RemotingSourcePtr source_;

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

@@ -914,8 +914,9 @@ void MediaRouterMojoImpl::OnProviderConnectionError(
 
 void MediaRouterMojoImpl::OnMediaRemoterCreated(
     int32_t tab_id,
-    media::mojom::MirrorServiceRemoterPtr remoter,
-    media::mojom::MirrorServiceRemotingSourceRequest source_request) {
+    mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter,
+    mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+        source_receiver) {
   DVLOG_WITH_INSTANCE(1) << __func__ << ": tab_id = " << tab_id;
 
   auto it = remoting_sources_.find(SessionID::FromSerializedValue(tab_id));
@@ -926,7 +927,7 @@ void MediaRouterMojoImpl::OnMediaRemoterCreated(
   }
 
   CastRemotingConnector* connector = it->second;
-  connector->ConnectToService(std::move(source_request), std::move(remoter));
+  connector->ConnectToService(std::move(source_receiver), std::move(remoter));
 }
 
 void MediaRouterMojoImpl::GetMediaSinkServiceStatus(

chrome/browser/media/router/mojo/media_router_mojo_impl.h

@@ -342,8 +342,9 @@ class MediaRouterMojoImpl : public MediaRouterBase, public mojom::MediaRouter {
       std::vector<mojom::RouteMessagePtr> messages) override;
   void OnMediaRemoterCreated(
       int32_t tab_id,
-      media::mojom::MirrorServiceRemoterPtr remoter,
-      media::mojom::MirrorServiceRemotingSourceRequest source_request) override;
+      mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter,
+      mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+          source_receiver) override;
   void GetMediaSinkServiceStatus(
       mojom::MediaRouter::GetMediaSinkServiceStatusCallback callback) override;
   void GetMirroringServiceHostForTab(

chrome/browser/media/router/test/mock_mojo_media_router.h

@@ -59,17 +59,20 @@ class MockMojoMediaRouter : public MockMediaRouter, public mojom::MediaRouter {
   MOCK_METHOD2(OnRouteMessagesReceived,
                void(const std::string& route_id,
                     std::vector<mojom::RouteMessagePtr> messages));
-  void OnMediaRemoterCreated(int32_t tab_id,
-                             media::mojom::MirrorServiceRemoterPtr remoter,
-                             media::mojom::MirrorServiceRemotingSourceRequest
-                                 source_request) override {
-    OnMediaRemoterCreatedInternal(tab_id, remoter, source_request);
+  void OnMediaRemoterCreated(
+      int32_t tab_id,
+      mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter,
+      mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+          source_receiver) override {
+    OnMediaRemoterCreatedInternal(tab_id, std::move(remoter),
+                                  std::move(source_receiver));
   }
   MOCK_METHOD3(
       OnMediaRemoterCreatedInternal,
       void(int32_t tab_id,
-           media::mojom::MirrorServiceRemoterPtr& remoter,
-           media::mojom::MirrorServiceRemotingSourceRequest& source_request));
+           mojo::PendingRemote<media::mojom::MirrorServiceRemoter> remoter,
+           mojo::PendingReceiver<media::mojom::MirrorServiceRemotingSource>
+               source_receiver));
   void GetMediaSinkServiceStatus(
       mojom::MediaRouter::GetMediaSinkServiceStatusCallback callback) override {
     GetMediaSinkServiceStatusInternal(callback);

chrome/common/media_router/mojom/media_router.mojom

@@ -573,8 +573,11 @@ interface MediaRouter {
   // can be used to access the MediaRemoter to control a media remoting session
   // and send RPC messages to the remote device. |remoting_source| is bound to
   // receive the updates/messages from MediaRemoter.
-  OnMediaRemoterCreated(int32 tab_id, media.mojom.MirrorServiceRemoter remoter,
-      media.mojom.MirrorServiceRemotingSource& remoting_source);
+  OnMediaRemoterCreated(
+      int32 tab_id,
+      pending_remote<media.mojom.MirrorServiceRemoter> remoter,
+      pending_receiver<media.mojom.MirrorServiceRemotingSource>
+          remoting_source);
 
   // Returns current status of media sink service in JSON format.
   GetMediaSinkServiceStatus() => (string status);