[Mojo Video Capture] Move conversions between mojom and media types to a separate file

services/video_capture/mojo_media_conversions.cc

Index: services/video_capture/mojo_media_conversions.cc
diff --git a/services/video_capture/video_capture_device_proxy_impl.cc b/services/video_capture/mojo_media_conversions.cc
similarity index 51%
copy from services/video_capture/video_capture_device_proxy_impl.cc
copy to services/video_capture/mojo_media_conversions.cc
index bb134db6647e16fd20c64cd2d4bc6b759bec355d..276baf5aac2e4621eed976b69cdd2ca4418ec96a 100644
--- a/services/video_capture/video_capture_device_proxy_impl.cc
+++ b/services/video_capture/mojo_media_conversions.cc
@@ -2,51 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/logging.h"
-#include "services/video_capture/device_client_mojo_to_media_adapter.h"
-#include "services/video_capture/video_capture_device_proxy_impl.h"
+#include "services/video_capture/mojo_media_conversions.h"
 
 namespace video_capture {
 
-VideoCaptureDeviceProxyImpl::VideoCaptureDeviceProxyImpl(
-    std::unique_ptr<media::VideoCaptureDevice> device)
-    : device_(std::move(device)) {}
-
-VideoCaptureDeviceProxyImpl::~VideoCaptureDeviceProxyImpl() {
-  if (device_running_)
-    device_->StopAndDeAllocate();
-}
-
-void VideoCaptureDeviceProxyImpl::Start(
-    mojom::VideoCaptureFormatPtr requested_format,
-    mojom::ResolutionChangePolicy resolution_change_policy,
-    mojom::PowerLineFrequency power_line_frequency,
-    mojom::VideoCaptureDeviceClientPtr client) {
-  media::VideoCaptureParams params;
-  params.requested_format = ConvertFromMojoToMedia(std::move(requested_format));
-  params.resolution_change_policy =
-      ConvertFromMojoToMedia(resolution_change_policy);
-  params.power_line_frequency = ConvertFromMojoToMedia(power_line_frequency);
-  client.set_connection_error_handler(
-      base::Bind(&VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose,
-                 base::Unretained(this)));
-  auto media_client =
-      base::MakeUnique<DeviceClientMojoToMediaAdapter>(std::move(client));
-  device_->AllocateAndStart(params, std::move(media_client));
-  device_running_ = true;
-}
-
-void VideoCaptureDeviceProxyImpl::Stop() {
-  device_->StopAndDeAllocate();
-  device_running_ = false;
-}
-
-void VideoCaptureDeviceProxyImpl::OnClientConnectionErrorOrClose() {
-  device_->StopAndDeAllocate();
-}
-
-// static
-media::VideoCaptureFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
+media::VideoCaptureFormat ConvertFromMojoToMedia(
     mojom::VideoCaptureFormatPtr format) {
   media::VideoCaptureFormat result;
   result.pixel_format = ConvertFromMojoToMedia(format->pixel_format);
@@ -57,8 +17,7 @@ media::VideoCaptureFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
   return result;
 }
 
-// static
-media::VideoPixelFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
+media::VideoPixelFormat ConvertFromMojoToMedia(
     media::mojom::VideoFormat format) {
   // Since there are static_asserts in place in
   // media/mojo/common/media_type_converters.cc to guarantee equality of the
@@ -66,8 +25,7 @@ media::VideoPixelFormat VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
   return static_cast<media::VideoPixelFormat>(format);
 }
 
-// static
-media::VideoPixelStorage VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
+media::VideoPixelStorage ConvertFromMojoToMedia(
     mojom::VideoPixelStorage storage) {
   switch (storage) {
     case mojom::VideoPixelStorage::CPU:
@@ -79,9 +37,7 @@ media::VideoPixelStorage VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
   return media::PIXEL_STORAGE_CPU;
 }
 
-// static
-media::ResolutionChangePolicy
-VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
+media::ResolutionChangePolicy ConvertFromMojoToMedia(
     mojom::ResolutionChangePolicy policy) {
   switch (policy) {
     case mojom::ResolutionChangePolicy::FIXED_RESOLUTION:
@@ -95,8 +51,7 @@ VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
   return media::RESOLUTION_POLICY_FIXED_RESOLUTION;
 }
 
-// static
-media::PowerLineFrequency VideoCaptureDeviceProxyImpl::ConvertFromMojoToMedia(
+media::PowerLineFrequency ConvertFromMojoToMedia(
     mojom::PowerLineFrequency frequency) {
   switch (frequency) {
     case mojom::PowerLineFrequency::DEFAULT: