[Mojo Video Capture] Cleanup naming of classes/files in services/video_capture

services/video_capture/public/interfaces/device_factory.mojom

Index: services/video_capture/public/interfaces/device_factory.mojom
diff --git a/services/video_capture/public/interfaces/video_capture_device_factory.mojom b/services/video_capture/public/interfaces/device_factory.mojom
similarity index 51%
rename from services/video_capture/public/interfaces/video_capture_device_factory.mojom
rename to services/video_capture/public/interfaces/device_factory.mojom
index bf0aa378590947489a609d5d10b7479ed028b8a7..4b6bd7a9461ac363debf890a9ba6f91fdca2d836 100644
--- a/services/video_capture/public/interfaces/video_capture_device_factory.mojom
+++ b/services/video_capture/public/interfaces/device_factory.mojom
@@ -5,9 +5,9 @@
 module video_capture.mojom;
 
 import "media/capture/mojo/video_capture_types.mojom";
-import "services/video_capture/public/interfaces/video_capture_device_descriptor.mojom";
-import "services/video_capture/public/interfaces/video_capture_device_proxy.mojom";
-import "services/video_capture/public/interfaces/video_capture_settings.mojom";
+import "services/video_capture/public/interfaces/device_descriptor.mojom";
+import "services/video_capture/public/interfaces/device.mojom";
+import "services/video_capture/public/interfaces/capture_settings.mojom";
 
 enum DeviceAccessResultCode {
   NOT_INITIALIZED,
@@ -20,28 +20,27 @@ enum DeviceAccessResultCode {
 // information about available devices. The |device_id| of the descriptors can
 // subsequently be used to either obtain the supported formats for a device
 // using GetSupportedFormats(), or to create an instance of
-// VideoCaptureDeviceProxy using CreateDeviceProxy().
+// video_capture.mojom.Device using CreateDevice().
 // The factory guarantees that no two device descriptors it returns use the
 // same |device_id|.
-interface VideoCaptureDeviceFactory {
+interface DeviceFactory {
   EnumerateDeviceDescriptors()
-      => (array<VideoCaptureDeviceDescriptor> descriptors);
+      => (array<DeviceDescriptor> descriptors);
 
   GetSupportedFormats(string device_id)
-      => (array<VideoCaptureFormat> supported_formats);
+      => (array<I420CaptureFormat> supported_formats);
 
   // Provides exclusive access to the device identified by |device_id|.
   // The access is valid until either the message pipe associated with
-  // |proxy_request| is closed by the client, or a subsequent call to
-  // CreateDeviceProxy() is made. When a subsequent call is made while the
-  // |proxy_request| from a previous call has not yet been closed, the service
-  // "revokes" that previous |proxy_request| (by closing the connection) and the
-  // exclusive access goes to the new |proxy_request|.
+  // |device_request| is closed by the client, or a subsequent call to
+  // CreateDevice() is made. When a subsequent call is made while the
+  // |device_request| from a previous call has not yet been closed, the service
+  // "revokes" that previous |device_request| (by closing the connection) and
+  // the exclusive access goes to the new |device_request|.
   // Note: This design avoids the issue of it not being clear how soon after a
-  // |proxy_request| has been (asynchronously) discarded a subsequent call to
-  // CreateDeviceProxy() would succeed if it were to deny access while still
+  // |device_request| has been (asynchronously) discarded a subsequent call to
+  // CreateDevice() would succeed if it were to deny access while still
   // in use.
-  CreateDeviceProxy(string device_id,
-                    VideoCaptureDeviceProxy& proxy_request)
+  CreateDevice(string device_id, Device& device_request)
       => (DeviceAccessResultCode result_code);
 };