diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc')
-rw-r--r-- | chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc b/chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc index bb47bd472ad..5b5ae1c4163 100644 --- a/chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc +++ b/chromium/content/browser/webrtc/webrtc_video_capture_shared_device_browsertest.cc @@ -6,19 +6,16 @@ #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" +#include "content/public/browser/video_capture_service.h" #include "content/public/common/content_features.h" #include "content/public/common/content_switches.h" -#include "content/public/common/service_manager_connection.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test.h" #include "content/public/test/content_browser_test_utils.h" #include "media/base/media_switches.h" -#include "services/service_manager/public/cpp/connector.h" #include "services/video_capture/public/cpp/mock_receiver.h" -#include "services/video_capture/public/mojom/constants.mojom.h" #include "services/video_capture/public/mojom/device.mojom.h" #include "services/video_capture/public/mojom/device_factory.mojom.h" -#include "services/video_capture/public/mojom/device_factory_provider.mojom.h" #include "services/video_capture/public/mojom/video_source.mojom.h" #include "services/video_capture/public/mojom/video_source_provider.mojom.h" #include "testing/gmock/include/gmock/gmock.h" @@ -49,6 +46,10 @@ struct TestParams { case media::VideoCaptureBufferType::kMailboxHolder: NOTREACHED(); return media::mojom::VideoBufferHandle::Tag::SHARED_BUFFER_HANDLE; +#if defined(OS_CHROMEOS) + case media::VideoCaptureBufferType::kGpuMemoryBuffer: + return media::mojom::VideoBufferHandle::Tag::GPU_MEMORY_BUFFER_HANDLE; +#endif } } }; @@ -69,25 +70,23 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest : public ContentBrowserTest, public testing::WithParamInterface<TestParams> { public: - WebRtcVideoCaptureSharedDeviceBrowserTest() : weak_factory_(this) { + WebRtcVideoCaptureSharedDeviceBrowserTest() { scoped_feature_list_.InitAndEnableFeature(features::kMojoVideoCapture); } ~WebRtcVideoCaptureSharedDeviceBrowserTest() override {} void OpenDeviceViaService() { - connector_->BindInterface(video_capture::mojom::kServiceName, - &device_factory_provider_); switch (GetParam().api_to_use) { case ServiceApi::kSingleClient: - device_factory_provider_->ConnectToDeviceFactory( + GetVideoCaptureService().ConnectToDeviceFactory( mojo::MakeRequest(&device_factory_)); device_factory_->GetDeviceInfos(base::BindOnce( &WebRtcVideoCaptureSharedDeviceBrowserTest::OnDeviceInfosReceived, weak_factory_.GetWeakPtr(), GetParam().buffer_type_to_request)); break; case ServiceApi::kMultiClient: - device_factory_provider_->ConnectToVideoSourceProvider( + GetVideoCaptureService().ConnectToVideoSourceProvider( mojo::MakeRequest(&video_source_provider_)); video_source_provider_->GetSourceInfos(base::BindOnce( &WebRtcVideoCaptureSharedDeviceBrowserTest::OnSourceInfosReceived, @@ -126,20 +125,11 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest void Initialize() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); main_task_runner_ = base::ThreadTaskRunnerHandle::Get(); - - auto* connection = content::ServiceManagerConnection::GetForProcess(); - ASSERT_TRUE(connection); - auto* connector = connection->GetConnector(); - ASSERT_TRUE(connector); - // We need to clone it so that we can use the clone on a different thread. - connector_ = connector->Clone(); - mock_receiver_ = std::make_unique<video_capture::MockReceiver>( mojo::MakeRequest(&receiver_proxy_)); } scoped_refptr<base::TaskRunner> main_task_runner_; - std::unique_ptr<service_manager::Connector> connector_; std::unique_ptr<video_capture::MockReceiver> mock_receiver_; private: @@ -202,7 +192,6 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest } base::test::ScopedFeatureList scoped_feature_list_; - video_capture::mojom::DeviceFactoryProviderPtr device_factory_provider_; // For single-client API case only video_capture::mojom::DeviceFactoryPtr device_factory_; @@ -214,7 +203,8 @@ class WebRtcVideoCaptureSharedDeviceBrowserTest video_capture::mojom::PushVideoStreamSubscriptionPtr subscription_; video_capture::mojom::ReceiverPtr receiver_proxy_; - base::WeakPtrFactory<WebRtcVideoCaptureSharedDeviceBrowserTest> weak_factory_; + base::WeakPtrFactory<WebRtcVideoCaptureSharedDeviceBrowserTest> weak_factory_{ + this}; DISALLOW_COPY_AND_ASSIGN(WebRtcVideoCaptureSharedDeviceBrowserTest); }; |