Migrate references to mirroring.mojom.SessionObserver to new mojo types

Convert the remaining bits that still use the old mojo types for
mirroring::mojom::SessionObserver to the new mojo types, and adapt
unit tests.

Bug: 955171
Change-Id: I715380ce54a13b93b7da99202f42b3a02a3519e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1807827
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697977}

chrome/browser/media/cast_mirroring_service_host.cc

@@ -180,7 +180,7 @@ CastMirroringServiceHost::~CastMirroringServiceHost() {}
 
 void CastMirroringServiceHost::Start(
     mojom::SessionParametersPtr session_params,
-    mojom::SessionObserverPtr observer,
+    mojo::PendingRemote<mojom::SessionObserver> observer,
     mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
     mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel) {
   // Start() should not be called in the middle of a mirroring session.

chrome/browser/media/cast_mirroring_service_host.h

@@ -73,7 +73,7 @@ class CastMirroringServiceHost final : public mojom::MirroringServiceHost,
 
   // mojom::MirroringServiceHost implementation.
   void Start(mojom::SessionParametersPtr session_params,
-             mojom::SessionObserverPtr observer,
+             mojo::PendingRemote<mojom::SessionObserver> observer,
              mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
              mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel)
       override;

chrome/browser/media/cast_mirroring_service_host_browsertest.cc

@@ -24,7 +24,6 @@
 #include "media/capture/video_capture_types.h"
 #include "media/mojo/mojom/audio_data_pipe.mojom.h"
 #include "media/mojo/mojom/audio_input_stream.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -130,8 +129,8 @@ class CastMirroringServiceHostBrowserTest
       public mojom::CastMessageChannel,
       public mojom::AudioStreamCreatorClient {
  public:
-  CastMirroringServiceHostBrowserTest() : observer_binding_(this) {}
-  ~CastMirroringServiceHostBrowserTest() override {}
+  CastMirroringServiceHostBrowserTest() = default;
+  ~CastMirroringServiceHostBrowserTest() override = default;
 
  protected:
   // Starts a tab mirroring session.
@@ -141,8 +140,8 @@ class CastMirroringServiceHostBrowserTest
     ASSERT_TRUE(web_contents);
     host_ = std::make_unique<CastMirroringServiceHost>(
         BuildMediaIdForTabMirroring(web_contents));
-    mojom::SessionObserverPtr observer;
-    observer_binding_.Bind(mojo::MakeRequest(&observer));
+    mojo::PendingRemote<mojom::SessionObserver> observer;
+    observer_receiver_.Bind(observer.InitWithNewPipeAndPassReceiver());
     mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel;
     outbound_channel_receiver_.Bind(
         outbound_channel.InitWithNewPipeAndPassReceiver());
@@ -230,7 +229,7 @@ class CastMirroringServiceHostBrowserTest
     OnAudioStreamCreated();
   }
 
-  mojo::Binding<mojom::SessionObserver> observer_binding_;
+  mojo::Receiver<mojom::SessionObserver> observer_receiver_{this};
   mojo::Receiver<mojom::CastMessageChannel> outbound_channel_receiver_{this};
   mojo::Receiver<mojom::AudioStreamCreatorClient> audio_client_receiver_{this};
   mojo::Remote<mojom::CastMessageChannel> inbound_channel_;

chrome/browser/media/router/providers/cast/mirroring_activity_record.cc

@@ -36,7 +36,6 @@ using cast_channel::Result;
 using media_router::mojom::MediaRouteProvider;
 using media_router::mojom::MediaRouter;
 using mirroring::mojom::SessionError;
-using mirroring::mojom::SessionObserverPtr;
 using mirroring::mojom::SessionParameters;
 using mirroring::mojom::SessionType;
 
@@ -71,9 +70,9 @@ MirroringActivityRecord::MirroringActivityRecord(
   media_router->GetMirroringServiceHostForTab(
       target_tab_id, host_.BindNewPipeAndPassReceiver());
 
-  // Create Mojo bindings for the interfaces this object implements.
-  SessionObserverPtr observer_ptr;
-  observer_binding_.Bind(mojo::MakeRequest(&observer_ptr));
+  // Bind Mojo receivers for the interfaces this object implements.
+  mojo::PendingRemote<mirroring::mojom::SessionObserver> observer_remote;
+  observer_receiver_.Bind(observer_remote.InitWithNewPipeAndPassReceiver());
   mojo::PendingRemote<mirroring::mojom::CastMessageChannel> channel_remote;
   channel_receiver_.Bind(channel_remote.InitWithNewPipeAndPassReceiver());
 
@@ -94,7 +93,7 @@ MirroringActivityRecord::MirroringActivityRecord(
       base::Unretained(host_.get()),
       SessionParameters::New(session_type, cast_data.ip_endpoint.address(),
                              cast_data.model_name),
-      std::move(observer_ptr), std::move(channel_remote),
+      std::move(observer_remote), std::move(channel_remote),
       channel_to_service_.BindNewPipeAndPassReceiver());
 }
 

chrome/browser/media/router/providers/cast/mirroring_activity_record.h

@@ -17,7 +17,6 @@
 #include "components/mirroring/mojom/cast_message_channel.mojom.h"
 #include "components/mirroring/mojom/mirroring_service_host.mojom.h"
 #include "components/mirroring/mojom/session_observer.mojom.h"
-#include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 
@@ -97,7 +96,7 @@ class MirroringActivityRecord : public ActivityRecord,
   // Sends Cast messages from the mirroring receiver to the mirroring service.
   mojo::Remote<mirroring::mojom::CastMessageChannel> channel_to_service_;
 
-  mojo::Binding<mirroring::mojom::SessionObserver> observer_binding_{this};
+  mojo::Receiver<mirroring::mojom::SessionObserver> observer_receiver_{this};
 
   // To handle Cast messages from the mirroring service to the mirroring
   // receiver.

components/mirroring/mojom/mirroring_service.mojom

@@ -20,7 +20,7 @@ interface MirroringService {
   // To stop the session, just close the message pipe.
   Start(SessionParameters params,
         gfx.mojom.Size max_resolution,
-        SessionObserver observer,
+        pending_remote<SessionObserver> observer,
         ResourceProvider resource_provider,
         pending_remote<CastMessageChannel> outbound_channel,
         pending_receiver<CastMessageChannel> inbound_channel);

components/mirroring/mojom/mirroring_service_host.mojom

@@ -17,7 +17,7 @@ interface MirroringServiceHost {
   // the messages from the mirroring receiver to the Mirroring Service.
   // To stop the session, just close the message pipe.
   Start(SessionParameters params,
-        SessionObserver observer,
+        pending_remote<SessionObserver> observer,
         pending_remote<CastMessageChannel> outbound_channel,
         pending_receiver<CastMessageChannel> inbound_channel);
 

components/mirroring/service/mirroring_service.cc

@@ -22,7 +22,7 @@ MirroringService::~MirroringService() = default;
 void MirroringService::Start(
     mojom::SessionParametersPtr params,
     const gfx::Size& max_resolution,
-    mojom::SessionObserverPtr observer,
+    mojo::PendingRemote<mojom::SessionObserver> observer,
     mojom::ResourceProviderPtr resource_provider,
     mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
     mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel) {

components/mirroring/service/mirroring_service.h

@@ -27,7 +27,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) MirroringService final
   // mojom::MirroringService implementation.
   void Start(mojom::SessionParametersPtr params,
              const gfx::Size& max_resolution,
-             mojom::SessionObserverPtr observer,
+             mojo::PendingRemote<mojom::SessionObserver> observer,
              mojom::ResourceProviderPtr resource_provider,
              mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
              mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel)

components/mirroring/service/session.cc

@@ -376,7 +376,7 @@ class Session::AudioCapturingCallback final
 Session::Session(
     mojom::SessionParametersPtr session_params,
     const gfx::Size& max_resolution,
-    mojom::SessionObserverPtr observer,
+    mojo::PendingRemote<mojom::SessionObserver> observer,
     mojom::ResourceProviderPtr resource_provider,
     mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
     mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel,

components/mirroring/service/session.h

@@ -62,7 +62,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) Session final
  public:
   Session(mojom::SessionParametersPtr session_params,
           const gfx::Size& max_resolution,
-          mojom::SessionObserverPtr observer,
+          mojo::PendingRemote<mojom::SessionObserver> observer,
           mojom::ResourceProviderPtr resource_provider,
           mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel,
           mojo::PendingReceiver<mojom::CastMessageChannel> inbound_channel,
@@ -157,7 +157,7 @@ class COMPONENT_EXPORT(MIRRORING_SERVICE) Session final
     STOPPED,    // The session is stopped due to user's request or errors.
   } state_;
 
-  mojom::SessionObserverPtr observer_;
+  mojo::Remote<mojom::SessionObserver> observer_;
   mojom::ResourceProviderPtr resource_provider_;
   MirrorSettings mirror_settings_;
 

components/mirroring/service/session_unittest.cc

@@ -78,8 +78,7 @@ class SessionTest : public mojom::ResourceProvider,
  public:
   SessionTest()
       : receiver_endpoint_(media::cast::test::GetFreeLocalPort()),
-        resource_provider_binding_(this),
-        session_observer_binding_(this) {}
+        resource_provider_binding_(this) {}
 
   ~SessionTest() override { task_environment_.RunUntilIdle(); }
 
@@ -203,10 +202,11 @@ class SessionTest : public mojom::ResourceProvider,
     session_params->receiver_model_name = "Chromecast";
     cast_mode_ = "mirroring";
     mojom::ResourceProviderPtr resource_provider_ptr;
-    mojom::SessionObserverPtr session_observer_ptr;
+    mojo::PendingRemote<mojom::SessionObserver> session_observer_remote;
     mojo::PendingRemote<mojom::CastMessageChannel> outbound_channel_remote;
     resource_provider_binding_.Bind(mojo::MakeRequest(&resource_provider_ptr));
-    session_observer_binding_.Bind(mojo::MakeRequest(&session_observer_ptr));
+    session_observer_receiver_.Bind(
+        session_observer_remote.InitWithNewPipeAndPassReceiver());
     outbound_channel_receiver_.Bind(
         outbound_channel_remote.InitWithNewPipeAndPassReceiver());
     // Expect to send OFFER message when session is created.
@@ -215,7 +215,7 @@ class SessionTest : public mojom::ResourceProvider,
     EXPECT_CALL(*this, OnOutboundMessage("OFFER")).Times(1);
     session_ = std::make_unique<Session>(
         std::move(session_params), gfx::Size(1920, 1080),
-        std::move(session_observer_ptr), std::move(resource_provider_ptr),
+        std::move(session_observer_remote), std::move(resource_provider_ptr),
         std::move(outbound_channel_remote),
         inbound_channel_.BindNewPipeAndPassReceiver(), nullptr);
     task_environment_.RunUntilIdle();
@@ -342,7 +342,7 @@ class SessionTest : public mojom::ResourceProvider,
   base::test::TaskEnvironment task_environment_;
   const net::IPEndPoint receiver_endpoint_;
   mojo::Binding<mojom::ResourceProvider> resource_provider_binding_;
-  mojo::Binding<mojom::SessionObserver> session_observer_binding_;
+  mojo::Receiver<mojom::SessionObserver> session_observer_receiver_{this};
   mojo::Receiver<mojom::CastMessageChannel> outbound_channel_receiver_{this};
   mojo::Remote<mojom::CastMessageChannel> inbound_channel_;
   SessionType session_type_ = SessionType::AUDIO_AND_VIDEO;