Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/android/video_capture_device_factory_android.h

Index: media/capture/video/android/video_capture_device_factory_android.h
diff --git a/media/capture/video/android/video_capture_device_factory_android.h b/media/capture/video/android/video_capture_device_factory_android.h
index aa1f36693ce6895edcefdaef833c06b0e0238967..d9cf00b10d3d21d559a2ff1953ed2f4d3339e680 100644
--- a/media/capture/video/android/video_capture_device_factory_android.h
+++ b/media/capture/video/android/video_capture_device_factory_android.h
@@ -28,14 +28,13 @@ class CAPTURE_EXPORT VideoCaptureDeviceFactoryAndroid
   VideoCaptureDeviceFactoryAndroid() {}
   ~VideoCaptureDeviceFactoryAndroid() override {}
 
-  std::unique_ptr<VideoCaptureDevice> Create(
-      const VideoCaptureDevice::Name& device_name) override;
-  void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;
-  void GetDeviceSupportedFormats(
-      const VideoCaptureDevice::Name& device,
-      VideoCaptureFormats* supported_formats) override;
-
- private:
+  std::unique_ptr<VideoCaptureDevice> CreateDevice(
+      const VideoCaptureDeviceDescriptor& device_descriptor) override;
+  void GetDeviceDescriptors(
+      VideoCaptureDeviceDescriptors* device_descriptors) override;
+  void GetSupportedFormats(const VideoCaptureDeviceDescriptor& device,
+                           VideoCaptureFormats* supported_formats) override;
+
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryAndroid);

[mcasas, 2016/07/30 00:06:11]

this should still be private
https://cs.chromium.org/chromium/src/base/macros.h?q=DISALLOW_COPY_AND_ASSIGN...

[chfremer, 2016/08/01 18:53:12]

Done.

 };
 }  // namespace media