services/video_capture/fake_device_descriptor_unittest.cc - Issue 2494033004: [Mojo Video Capture] Use string keys instead of VideoCaptureDeviceDescriptor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/video_capture/fake_device_descriptor_unittest.cc

Issue 2494033004: [Mojo Video Capture] Use string keys instead of VideoCaptureDeviceDescriptor (Closed)

Patch Set: yzshen's comment Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« services/video_capture/device_factory_media_to_mojo_adapter.cc ('K') | « services/video_capture/device_factory_media_to_mojo_adapter.cc ('k') | services/video_capture/fake_device_test.cc » ('j') | services/video_capture/public/interfaces/video_capture_device_factory.mojom » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/video_capture/fake_device_descriptor_unittest.cc

diff --git a/services/video_capture/fake_device_descriptor_unittest.cc b/services/video_capture/fake_device_descriptor_unittest.cc

index 810dbfbbc1364d4d24d1661719552932d838d32b..08af99f5e1d25520f8915d21adb2dcb637769a5c 100644

--- a/services/video_capture/fake_device_descriptor_unittest.cc

+++ b/services/video_capture/fake_device_descriptor_unittest.cc

@@ -27,7 +27,7 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {

Run(mojom::DeviceAccessResultCode::SUCCESS))

.Times(1);

factory_->CreateDeviceProxy(

- fake_device_descriptor_, mojo::GetProxy(&device_proxy_1),

+ fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_1),

base::Bind(&MockCreateDeviceProxyCallback::Run,

base::Unretained(&create_device_proxy_callback_1)));

device_proxy_1.set_connection_error_handler(

@@ -43,7 +43,7 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {

.Times(1)

.WillOnce(InvokeWithoutArgs([&wait_loop]() { wait_loop.Quit(); }));

factory_->CreateDeviceProxy(

- fake_device_descriptor_, mojo::GetProxy(&device_proxy_2),

+ fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_2),

base::Bind(&MockCreateDeviceProxyCallback::Run,

base::Unretained(&create_device_proxy_callback_2)));

device_proxy_2.set_connection_error_handler(

@@ -58,13 +58,13 @@ TEST_F(FakeDeviceDescriptorTest, AccessIsRevokedOnSecondAccess) {

TEST_F(FakeDeviceDescriptorTest, CanUseSecondRequestedProxy) {

mojom::VideoCaptureDeviceProxyPtr device_proxy_1;

factory_->CreateDeviceProxy(

- fake_device_descriptor_, mojo::GetProxy(&device_proxy_1),

+ fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_1),

base::Bind([](mojom::DeviceAccessResultCode result_code) {}));

base::RunLoop wait_loop;

mojom::VideoCaptureDeviceProxyPtr device_proxy_2;

factory_->CreateDeviceProxy(

- fake_device_descriptor_, mojo::GetProxy(&device_proxy_2),

+ fake_device_descriptor_.device_id, mojo::GetProxy(&device_proxy_2),

base::Bind(

[](base::RunLoop* wait_loop,

mojom::DeviceAccessResultCode result_code) { wait_loop->Quit(); },