Video Capture Service: typemap video_capture's and media's VideoCaptureFormat

services/video_capture/mock_device_video_capture_service_test.cc

Index: services/video_capture/mock_device_video_capture_service_test.cc
diff --git a/services/video_capture/mock_device_video_capture_service_test.cc b/services/video_capture/mock_device_video_capture_service_test.cc
index 513f4a5957e0f29ffad8121c7391616c8d2a0f06..71469a270f9b963be40cc679943af95beba3d4e0 100644
--- a/services/video_capture/mock_device_video_capture_service_test.cc
+++ b/services/video_capture/mock_device_video_capture_service_test.cc
@@ -31,12 +31,10 @@ void MockDeviceVideoCaptureServiceTest::SetUp() {
       base::Bind([](mojom::DeviceAccessResultCode result_code) {}));
 
   // Start the mock device with an arbitrary format
-  gfx::Size requested_size(800, 600);
-  requested_format_ = mojom::VideoCaptureFormat::New();
-  requested_format_->frame_size = requested_size;
-  requested_format_->frame_rate = 15;
-  requested_format_->pixel_format = media::mojom::VideoFormat::I420;
-  requested_format_->pixel_storage = mojom::VideoPixelStorage::CPU;
+  requested_format_.frame_size = gfx::Size(800, 600);
+  requested_format_.frame_rate = 15;
+  requested_format_.pixel_format = media::PIXEL_FORMAT_I420;
+  requested_format_.pixel_storage = media::PIXEL_STORAGE_CPU;
   mock_client_ = base::MakeUnique<MockVideoCaptureDeviceClient>(
       mojo::GetProxy(&mock_client_proxy_));
 }