Migrate references to the video_capture::mojom::VideoSource interface

Convert the remaining bits referencing the VideoSource mojo interface
(from video_capture service) using the old APIs to the new mojo types,
and adapt unit tests.

Bug: 955171
Change-Id: Ib647a30ca7c95683bf9edca0e89d7bba1ce53d75
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1886893
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711651}

content/browser/renderer_host/media/service_launched_video_capture_device.cc

@@ -12,7 +12,7 @@
 namespace content {
 
 ServiceLaunchedVideoCaptureDevice::ServiceLaunchedVideoCaptureDevice(
-    video_capture::mojom::VideoSourcePtr source,
+    mojo::Remote<video_capture::mojom::VideoSource> source,
     mojo::Remote<video_capture::mojom::PushVideoStreamSubscription>
         subscription,
     base::OnceClosure connection_lost_cb)
@@ -20,7 +20,7 @@ ServiceLaunchedVideoCaptureDevice::ServiceLaunchedVideoCaptureDevice(
       subscription_(std::move(subscription)),
       connection_lost_cb_(std::move(connection_lost_cb)) {
   // Unretained |this| is safe, because |this| owns |source_|.
-  source_.set_connection_error_handler(
+  source_.set_disconnect_handler(
       base::BindOnce(&ServiceLaunchedVideoCaptureDevice::
                          OnLostConnectionToSourceOrSubscription,
                      base::Unretained(this)));

content/browser/renderer_host/media/service_launched_video_capture_device.h

@@ -17,7 +17,7 @@ namespace content {
 class ServiceLaunchedVideoCaptureDevice : public LaunchedVideoCaptureDevice {
  public:
   ServiceLaunchedVideoCaptureDevice(
-      video_capture::mojom::VideoSourcePtr source,
+      mojo::Remote<video_capture::mojom::VideoSource> source,
       mojo::Remote<video_capture::mojom::PushVideoStreamSubscription>
           subscription,
       base::OnceClosure connection_lost_cb);
@@ -52,7 +52,7 @@ class ServiceLaunchedVideoCaptureDevice : public LaunchedVideoCaptureDevice {
       media::VideoCaptureDevice::TakePhotoCallback callback,
       media::mojom::BlobPtr blob);
 
-  video_capture::mojom::VideoSourcePtr source_;
+  mojo::Remote<video_capture::mojom::VideoSource> source_;
   mojo::Remote<video_capture::mojom::PushVideoStreamSubscription> subscription_;
   base::OnceClosure connection_lost_cb_;
   base::SequenceChecker sequence_checker_;

content/browser/renderer_host/media/service_video_capture_device_launcher.cc

@@ -25,7 +25,7 @@ namespace content {
 namespace {
 
 void ConcludeLaunchDeviceWithSuccess(
-    video_capture::mojom::VideoSourcePtr source,
+    mojo::Remote<video_capture::mojom::VideoSource> source,
     mojo::Remote<video_capture::mojom::PushVideoStreamSubscription>
         subscription,
     base::OnceClosure connection_lost_cb,
@@ -109,9 +109,9 @@ void ServiceVideoCaptureDeviceLauncher::LaunchDeviceAsync(
   // invoked.
   done_cb_ = std::move(done_cb);
   callbacks_ = callbacks;
-  video_capture::mojom::VideoSourcePtr source;
+  mojo::Remote<video_capture::mojom::VideoSource> source;
   service_connection_->source_provider()->GetVideoSource(
-      device_id, mojo::MakeRequest(&source));
+      device_id, source.BindNewPipeAndPassReceiver());
 
   auto receiver_adapter =
       std::make_unique<video_capture::ReceiverMediaToMojoAdapter>(
@@ -172,7 +172,7 @@ void ServiceVideoCaptureDeviceLauncher::AbortLaunch() {
 }
 
 void ServiceVideoCaptureDeviceLauncher::OnCreatePushSubscriptionCallback(
-    video_capture::mojom::VideoSourcePtr source,
+    mojo::Remote<video_capture::mojom::VideoSource> source,
     mojo::Remote<video_capture::mojom::PushVideoStreamSubscription>
         subscription,
     base::OnceClosure connection_lost_cb,

content/browser/renderer_host/media/service_video_capture_device_launcher.h

@@ -47,7 +47,7 @@ class CONTENT_EXPORT ServiceVideoCaptureDeviceLauncher
   };
 
   void OnCreatePushSubscriptionCallback(
-      video_capture::mojom::VideoSourcePtr source,
+      mojo::Remote<video_capture::mojom::VideoSource> source,
       mojo::Remote<video_capture::mojom::PushVideoStreamSubscription>
           subscription,
       base::OnceClosure connection_lost_cb,

content/browser/renderer_host/media/service_video_capture_device_launcher_unittest.cc

@@ -16,6 +16,7 @@
 #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/receiver.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
 #include "services/video_capture/public/cpp/mock_push_subscription.h"
 #include "services/video_capture/public/cpp/mock_video_source.h"
@@ -52,7 +53,7 @@ class ServiceVideoCaptureDeviceLauncherTest : public testing::Test {
   ServiceVideoCaptureDeviceLauncherTest() {}
   ~ServiceVideoCaptureDeviceLauncherTest() override {}
 
-  void CloseSourceBinding() { source_binding_.reset(); }
+  void CloseSourceReceiver() { source_receiver_.reset(); }
 
   void CloseSubscriptionReceivers() { subscription_receivers_.Clear(); }
 
@@ -86,10 +87,11 @@ class ServiceVideoCaptureDeviceLauncherTest : public testing::Test {
     ON_CALL(mock_source_provider_, DoGetVideoSource(kStubDeviceId, _))
         .WillByDefault(Invoke(
             [this](const std::string& device_id,
-                   video_capture::mojom::VideoSourceRequest* source_request) {
-              source_binding_ = std::make_unique<
-                  mojo::Binding<video_capture::mojom::VideoSource>>(
-                  &mock_source_, std::move(*source_request));
+                   mojo::PendingReceiver<video_capture::mojom::VideoSource>*
+                       source_receiver) {
+              source_receiver_ = std::make_unique<
+                  mojo::Receiver<video_capture::mojom::VideoSource>>(
+                  &mock_source_, std::move(*source_receiver));
             }));
 
     ON_CALL(mock_source_, DoCreatePushSubscription(_, _, _, _, _))
@@ -127,8 +129,8 @@ class ServiceVideoCaptureDeviceLauncherTest : public testing::Test {
   std::unique_ptr<mojo::Binding<video_capture::mojom::VideoSourceProvider>>
       source_provider_binding_;
   video_capture::MockVideoSource mock_source_;
-  std::unique_ptr<mojo::Binding<video_capture::mojom::VideoSource>>
-      source_binding_;
+  std::unique_ptr<mojo::Receiver<video_capture::mojom::VideoSource>>
+      source_receiver_;
   video_capture::MockPushSubcription mock_subscription_;
   mojo::ReceiverSet<video_capture::mojom::PushVideoStreamSubscription>
       subscription_receivers_;
@@ -376,7 +378,7 @@ TEST_F(ServiceVideoCaptureDeviceLauncherTest,
   // Cleanup
   // Cut the connection to the source, so that the outstanding
   // |create_subscription_cb| will be dropped when we invoke it below.
-  source_binding_.reset();
+  source_receiver_.reset();
   // We have to invoke the callback, because not doing so triggers a DCHECK.
   const video_capture::mojom::CreatePushSubscriptionResultCode
       arbitrary_result_code = video_capture::mojom::
@@ -387,9 +389,9 @@ TEST_F(ServiceVideoCaptureDeviceLauncherTest,
 
 TEST_F(ServiceVideoCaptureDeviceLauncherTest,
        ConnectionToSubscriptionLostAfterSuccessfulLaunch) {
-  RunConnectionLostAfterSuccessfulStartTest(
-      base::BindOnce(&ServiceVideoCaptureDeviceLauncherTest::CloseSourceBinding,
-                     base::Unretained(this)));
+  RunConnectionLostAfterSuccessfulStartTest(base::BindOnce(
+      &ServiceVideoCaptureDeviceLauncherTest::CloseSourceReceiver,
+      base::Unretained(this)));
 }
 
 TEST_F(ServiceVideoCaptureDeviceLauncherTest,

content/browser/renderer_host/media/service_video_capture_provider_unittest.cc

@@ -98,10 +98,11 @@ class ServiceVideoCaptureProviderTest : public testing::Test {
         }));
 
     ON_CALL(mock_source_provider_, DoGetVideoSource(_, _))
-        .WillByDefault(
-            Invoke([this](const std::string& device_id,
-                          video_capture::mojom::VideoSourceRequest* request) {
-              source_bindings_.AddBinding(&mock_source_, std::move(*request));
+        .WillByDefault(Invoke(
+            [this](const std::string& device_id,
+                   mojo::PendingReceiver<video_capture::mojom::VideoSource>*
+                       receiver) {
+              source_receivers_.Add(&mock_source_, std::move(*receiver));
             }));
 
     ON_CALL(mock_source_, DoCreatePushSubscription(_, _, _, _, _))
@@ -132,7 +133,7 @@ class ServiceVideoCaptureProviderTest : public testing::Test {
   mojo::Binding<video_capture::mojom::VideoSourceProvider>
       source_provider_binding_;
   video_capture::MockVideoSource mock_source_;
-  mojo::BindingSet<video_capture::mojom::VideoSource> source_bindings_;
+  mojo::ReceiverSet<video_capture::mojom::VideoSource> source_receivers_;
   video_capture::MockPushSubcription mock_subscription_;
   mojo::ReceiverSet<video_capture::mojom::PushVideoStreamSubscription>
       subscription_receivers_;

content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc

@@ -164,8 +164,9 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest
       media::VideoCaptureBufferType buffer_type_to_request,
       const std::vector<media::VideoCaptureDeviceInfo>& infos) {
     ASSERT_FALSE(infos.empty());
-    video_source_provider_->GetVideoSource(infos[0].descriptor.device_id,
-                                           mojo::MakeRequest(&video_source_));
+    video_source_provider_->GetVideoSource(
+        infos[0].descriptor.device_id,
+        video_source_.BindNewPipeAndPassReceiver());
 
     media::VideoCaptureParams requestable_settings;
     ASSERT_FALSE(infos[0].supported_formats.empty());
@@ -198,7 +199,7 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest
 
   // For multi-client API case only
   video_capture::mojom::VideoSourceProviderPtr video_source_provider_;
-  video_capture::mojom::VideoSourcePtr video_source_;
+  mojo::Remote<video_capture::mojom::VideoSource> video_source_;
   mojo::Remote<video_capture::mojom::PushVideoStreamSubscription> subscription_;
 
   mojo::PendingRemote<video_capture::mojom::Receiver> subscriber_;

services/video_capture/public/cpp/mock_video_source_provider.cc

@@ -12,8 +12,8 @@ MockVideoSourceProvider::~MockVideoSourceProvider() = default;
 
 void MockVideoSourceProvider::GetVideoSource(
     const std::string& device_id,
-    video_capture::mojom::VideoSourceRequest source_request) {
-  DoGetVideoSource(device_id, &source_request);
+    mojo::PendingReceiver<video_capture::mojom::VideoSource> source_receiver) {
+  DoGetVideoSource(device_id, &source_receiver);
 }
 
 void MockVideoSourceProvider::GetSourceInfos(GetSourceInfosCallback callback) {

services/video_capture/public/cpp/mock_video_source_provider.h

@@ -20,9 +20,9 @@ class MockVideoSourceProvider
   MockVideoSourceProvider();
   ~MockVideoSourceProvider() override;
 
-  void GetVideoSource(
-      const std::string& device_id,
-      video_capture::mojom::VideoSourceRequest source_request) override;
+  void GetVideoSource(const std::string& device_id,
+                      mojo::PendingReceiver<video_capture::mojom::VideoSource>
+                          source_receiver) override;
 
   void GetSourceInfos(GetSourceInfosCallback callback) override;
 
@@ -47,9 +47,10 @@ class MockVideoSourceProvider
   void Close(CloseCallback callback) override;
 
   MOCK_METHOD1(DoGetSourceInfos, void(GetSourceInfosCallback& callback));
-  MOCK_METHOD2(DoGetVideoSource,
-               void(const std::string& device_id,
-                    video_capture::mojom::VideoSourceRequest* request));
+  MOCK_METHOD2(
+      DoGetVideoSource,
+      void(const std::string& device_id,
+           mojo::PendingReceiver<video_capture::mojom::VideoSource>* receiver));
   MOCK_METHOD3(
       DoAddVirtualDevice,
       void(

services/video_capture/public/mojom/video_source_provider.mojom

@@ -17,7 +17,7 @@ interface VideoSourceProvider {
   // This essentially constrains things down to a particular source. This is
   // useful for subsequently passing the resulting |stream| to clients that
   // are supposed to get access to only a particular source.
-  GetVideoSource(string source_id, VideoSource& stream);
+  GetVideoSource(string source_id, pending_receiver<VideoSource> stream);
 
   // Creates a new virtual capture device, which will be exposed
   // using the given |device_info|. The returned |virtual_device| is to

services/video_capture/test/mock_device_shared_access_unittest.cc

@@ -69,7 +69,7 @@ class MockDeviceSharedAccessTest : public ::testing::Test {
     // CreateDevice.
     wait_loop.Run();
     source_provider_->GetVideoSource(mock_descriptor.device_id,
-                                     mojo::MakeRequest(&source_));
+                                     source_.BindNewPipeAndPassReceiver());
 
     requestable_settings_.requested_format.frame_size = gfx::Size(800, 600);
     requestable_settings_.requested_format.frame_rate = 15;
@@ -255,7 +255,7 @@ class MockDeviceSharedAccessTest : public ::testing::Test {
   media::MockDeviceFactory* mock_device_factory_;
   std::unique_ptr<DeviceFactoryMediaToMojoAdapter> service_device_factory_;
   std::unique_ptr<VideoSourceProviderImpl> source_provider_;
-  mojom::VideoSourcePtr source_;
+  mojo::Remote<mojom::VideoSource> source_;
   media::VideoCaptureParams requestable_settings_;
 
   mojo::Remote<mojom::PushVideoStreamSubscription> subscription_1_;

services/video_capture/video_source_impl.cc

@@ -19,19 +19,20 @@ VideoSourceImpl::VideoSourceImpl(
       on_last_binding_closed_cb_(std::move(on_last_binding_closed_cb)),
       device_status_(DeviceStatus::kNotStarted),
       restart_device_once_when_stop_complete_(false) {
-  // Unretained(this) is safe because |this| owns |bindings_|.
-  bindings_.set_connection_error_handler(base::BindRepeating(
+  // Unretained(this) is safe because |this| owns |receivers_|.
+  receivers_.set_disconnect_handler(base::BindRepeating(
       &VideoSourceImpl::OnClientDisconnected, base::Unretained(this)));
 }
 
 VideoSourceImpl::~VideoSourceImpl() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  bindings_.set_connection_error_handler(base::DoNothing());
+  receivers_.set_disconnect_handler(base::DoNothing());
 }
 
-void VideoSourceImpl::AddToBindingSet(mojom::VideoSourceRequest request) {
+void VideoSourceImpl::AddToReceiverSet(
+    mojo::PendingReceiver<VideoSource> receiver) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  bindings_.AddBinding(this, std::move(request));
+  receivers_.Add(this, std::move(receiver));
 }
 
 void VideoSourceImpl::CreatePushSubscription(
@@ -81,7 +82,7 @@ void VideoSourceImpl::CreatePushSubscription(
 
 void VideoSourceImpl::OnClientDisconnected() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  if (bindings_.empty()) {
+  if (receivers_.empty()) {
     // Note: Invoking this callback may synchronously trigger the destruction of
     // |this|, so no more member access should be done after it.
     on_last_binding_closed_cb_.Run();

services/video_capture/video_source_impl.h

@@ -9,10 +9,11 @@
 
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/public/cpp/bindings/binding_set.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/receiver_set.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/video_capture/broadcasting_receiver.h"
 #include "services/video_capture/device_factory_media_to_mojo_adapter.h"
@@ -31,7 +32,7 @@ class VideoSourceImpl : public mojom::VideoSource {
                   base::RepeatingClosure on_last_binding_closed_cb);
   ~VideoSourceImpl() override;
 
-  void AddToBindingSet(mojom::VideoSourceRequest request);
+  void AddToReceiverSet(mojo::PendingReceiver<VideoSource> receiver);
 
   // mojom::VideoSource implementation.
   void CreatePushSubscription(
@@ -61,7 +62,7 @@ class VideoSourceImpl : public mojom::VideoSource {
 
   mojom::DeviceFactory* const device_factory_;
   const std::string device_id_;
-  mojo::BindingSet<mojom::VideoSource> bindings_;
+  mojo::ReceiverSet<mojom::VideoSource> receivers_;
   base::RepeatingClosure on_last_binding_closed_cb_;
 
   // We use the address of each instance as keys to itself.

services/video_capture/video_source_provider_impl.cc

@@ -36,7 +36,7 @@ void VideoSourceProviderImpl::GetSourceInfos(GetSourceInfosCallback callback) {
 
 void VideoSourceProviderImpl::GetVideoSource(
     const std::string& device_id,
-    mojom::VideoSourceRequest source_request) {
+    mojo::PendingReceiver<mojom::VideoSource> source_receiver) {
   auto source_iter = sources_.find(device_id);
   if (source_iter == sources_.end()) {
     auto video_source = std::make_unique<VideoSourceImpl>(
@@ -48,7 +48,7 @@ void VideoSourceProviderImpl::GetVideoSource(
         sources_.insert(std::make_pair(device_id, std::move(video_source)))
             .first;
   }
-  source_iter->second->AddToBindingSet(std::move(source_request));
+  source_iter->second->AddToReceiverSet(std::move(source_receiver));
 }
 
 void VideoSourceProviderImpl::AddSharedMemoryVirtualDevice(

services/video_capture/video_source_provider_impl.h

@@ -28,8 +28,9 @@ class VideoSourceProviderImpl : public mojom::VideoSourceProvider {
 
   // mojom::VideoSourceProvider implementation.
   void GetSourceInfos(GetSourceInfosCallback callback) override;
-  void GetVideoSource(const std::string& device_id,
-                      mojom::VideoSourceRequest source_request) override;
+  void GetVideoSource(
+      const std::string& device_id,
+      mojo::PendingReceiver<mojom::VideoSource> source_receiver) override;
   void AddSharedMemoryVirtualDevice(
       const media::VideoCaptureDeviceInfo& device_info,
       mojo::PendingRemote<mojom::Producer> producer,