[Mojo Video Capture] Simplify API and some cleanups

services/video_capture/fake_device_descriptor_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/run_loop.h"
 #include "services/video_capture/fake_device_descriptor_test.h"
 #include "services/video_capture/mock_video_frame_receiver.h"
 
 using testing::_;
 using testing::InvokeWithoutArgs;
@@ skipping 53 matching lines @@
   base::RunLoop wait_loop;
   mojom::VideoCaptureDeviceProxyPtr device_proxy_2;
   factory_->CreateDeviceProxy(
       fake_device_descriptor_->Clone(), mojo::GetProxy(&device_proxy_2),
       base::Bind(
           [](base::RunLoop* wait_loop,
              mojom::DeviceAccessResultCode result_code) { wait_loop->Quit(); },
           &wait_loop));
   wait_loop.Run();
 
-  media::VideoCaptureFormat arbitrary_requested_format;
-  arbitrary_requested_format.frame_size.SetSize(640, 480);
-  arbitrary_requested_format.frame_rate = 15;
-  arbitrary_requested_format.pixel_format = media::PIXEL_FORMAT_I420;
-  arbitrary_requested_format.pixel_storage = media::PIXEL_STORAGE_CPU;
+  VideoCaptureSettings arbitrary_requested_settings;
+  arbitrary_requested_settings.format.frame_size.SetSize(640, 480);
+  arbitrary_requested_settings.format.frame_rate = 15;
+  arbitrary_requested_settings.resolution_change_policy =
+      media::RESOLUTION_POLICY_FIXED_RESOLUTION;
+  arbitrary_requested_settings.power_line_frequency =
+      media::PowerLineFrequency::FREQUENCY_DEFAULT;
 
   base::RunLoop wait_loop_2;
   mojom::VideoFrameReceiverPtr receiver_proxy;
   MockVideoFrameReceiver receiver(mojo::GetProxy(&receiver_proxy));
   EXPECT_CALL(receiver, OnIncomingCapturedVideoFramePtr(_))
       .WillRepeatedly(
           InvokeWithoutArgs([&wait_loop_2]() { wait_loop_2.Quit(); }));
 
-  device_proxy_2->Start(arbitrary_requested_format,
-                        media::RESOLUTION_POLICY_FIXED_RESOLUTION,
-                        media::PowerLineFrequency::FREQUENCY_DEFAULT,
+  device_proxy_2->Start(arbitrary_requested_settings,
                         std::move(receiver_proxy));
   wait_loop_2.Run();
 }
 
 }  // namespace video_capture