Replace manual conversions with Mojo type mappings

services/video_capture/mock_device_factory.cc

Index: services/video_capture/mock_device_factory.cc
diff --git a/services/video_capture/mock_device_factory.cc b/services/video_capture/mock_device_factory.cc
index 475ad2982dfd883b37e4782618403abe9b7fe0da..a32497db5efa82f101a3f1ab0c9ba4eaa9863b40 100644
--- a/services/video_capture/mock_device_factory.cc
+++ b/services/video_capture/mock_device_factory.cc
@@ -10,7 +10,6 @@
 #include "base/strings/stringprintf.h"
 #include "media/capture/video/fake_video_capture_device.h"
 #include "services/video_capture/device_mock_to_media_adapter.h"
-#include "services/video_capture/mojo_media_conversions.h"
 
 namespace {
 // Report a single hard-coded supported format to clients.
@@ -28,10 +27,8 @@ MockDeviceFactory::~MockDeviceFactory() = default;
 
 void MockDeviceFactory::AddMockDevice(
     mojom::MockVideoCaptureDevicePtr device,
-    mojom::VideoCaptureDeviceDescriptorPtr descriptor) {
-  media::VideoCaptureDeviceDescriptor media_descriptor =
-       ConvertFromMojoToMedia(std::move(descriptor));
-  devices_[media_descriptor] = std::move(device);
+    const media::VideoCaptureDeviceDescriptor& descriptor) {
+  devices_[descriptor] = std::move(device);
 }
 
 std::unique_ptr<media::VideoCaptureDevice> MockDeviceFactory::CreateDevice(