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

services/video_capture/public/interfaces/capture_settings_traits.h

Index: services/video_capture/public/interfaces/capture_settings_traits.h
diff --git a/services/video_capture/public/interfaces/video_capture_settings_traits.h b/services/video_capture/public/interfaces/capture_settings_traits.h
similarity index 35%
rename from services/video_capture/public/interfaces/video_capture_settings_traits.h
rename to services/video_capture/public/interfaces/capture_settings_traits.h
index 100661a7ef2cd310b4022fcc7e128400d94b3391..1074f71b31fe5cf778ae60d6fc455d9bec5c296d 100644
--- a/services/video_capture/public/interfaces/video_capture_settings_traits.h
+++ b/services/video_capture/public/interfaces/capture_settings_traits.h
@@ -2,53 +2,52 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_VIDEO_CAPTURE_SETTINGS_TRAITS_H_
-#define SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_VIDEO_CAPTURE_SETTINGS_TRAITS_H_
+#ifndef SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_CAPTURE_SETTINGS_TRAITS_H_
+#define SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_CAPTURE_SETTINGS_TRAITS_H_
 
 #include "media/capture/video_capture_types.h"
 #include "mojo/common/common_custom_types_struct_traits.h"
-#include "services/video_capture/public/interfaces/video_capture_device_proxy.mojom.h"
+#include "services/video_capture/public/interfaces/device.mojom.h"
 
 namespace mojo {
 
 template <>
-struct StructTraits<video_capture::mojom::VideoCaptureFormatDataView,
-                    video_capture::VideoCaptureFormat> {
+struct StructTraits<video_capture::mojom::I420CaptureFormatDataView,
+                    video_capture::I420CaptureFormat> {
   static const gfx::Size& frame_size(
-      const video_capture::VideoCaptureFormat& input) {
+      const video_capture::I420CaptureFormat& input) {
     return input.frame_size;
   }
 
-  static float frame_rate(const video_capture::VideoCaptureFormat& input) {
+  static float frame_rate(const video_capture::I420CaptureFormat& input) {
     return input.frame_rate;
   }
 
-  static bool Read(video_capture::mojom::VideoCaptureFormatDataView data,
-                   video_capture::VideoCaptureFormat* out);
+  static bool Read(video_capture::mojom::I420CaptureFormatDataView data,
+                   video_capture::I420CaptureFormat* out);
 };
 
 template <>
-struct StructTraits<video_capture::mojom::VideoCaptureSettingsDataView,
-                    video_capture::VideoCaptureSettings> {
-  static const video_capture::VideoCaptureFormat& format(
-      const video_capture::VideoCaptureSettings& input) {
+struct StructTraits<video_capture::mojom::CaptureSettingsDataView,
+                    video_capture::CaptureSettings> {
+  static const video_capture::I420CaptureFormat& format(
+      const video_capture::CaptureSettings& input) {
     return input.format;
   }
 
   static media::ResolutionChangePolicy resolution_change_policy(
-      const video_capture::VideoCaptureSettings& input) {
+      const video_capture::CaptureSettings& input) {
     return input.resolution_change_policy;
   }
 
   static media::PowerLineFrequency power_line_frequency(
-      const video_capture::VideoCaptureSettings& input) {
+      const video_capture::CaptureSettings& input) {
     return input.power_line_frequency;
   }
 
-  static bool Read(video_capture::mojom::VideoCaptureSettingsDataView data,
-                   video_capture::VideoCaptureSettings* out);
+  static bool Read(video_capture::mojom::CaptureSettingsDataView data,
+                   video_capture::CaptureSettings* out);
 };
-
 }
 
-#endif  // SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_VIDEO_CAPTURE_SETTINGS_TRAITS_H_
+#endif  // SERVICES_VIDEO_CAPTURE_PUBLIC_INTERFACES_CAPTURE_SETTINGS_TRAITS_H_