Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/mac/video_capture_device_mac.h

Index: media/capture/video/mac/video_capture_device_mac.h
diff --git a/media/capture/video/mac/video_capture_device_mac.h b/media/capture/video/mac/video_capture_device_mac.h
index 7eff128ab1e0b50ee05c893364027f5625fb78af..430ef409048b9c1103b41e6a36699f05b5d3ae5b 100644
--- a/media/capture/video/mac/video_capture_device_mac.h
+++ b/media/capture/video/mac/video_capture_device_mac.h
@@ -54,7 +54,11 @@ namespace media {
 // capture devices.
 class VideoCaptureDeviceMac : public VideoCaptureDevice {
  public:
-  explicit VideoCaptureDeviceMac(const Name& device_name);
+  static std::string GetDeviceModelId(
+      const VideoCaptureDeviceDescriptor& device_descriptor);

[emircan, 2016/07/25 22:56:40]

Move this below ctor/dtor. Also, make sure it appears in the same order in .cc

https://google.github.io/styleguide/cppguide.html#Declaration_Order

[chfremer, 2016/07/26 16:56:35]

Done.

+
+  explicit VideoCaptureDeviceMac(
+      const VideoCaptureDeviceDescriptor& device_descriptor);
   ~VideoCaptureDeviceMac() override;
 
   // VideoCaptureDevice implementation.
@@ -64,7 +68,7 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
   void StopAndDeAllocate() override;
   void TakePhoto(TakePhotoCallback callback) override;
 
-  bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type);
+  bool Init(VideoCaptureApiType capture_api_type);
 
   // Called to deliver captured video frames.  It's safe to call this method
   // from any thread, including those controlled by AVFoundation.
@@ -97,7 +101,7 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice {
   // Flag indicating the internal state.
   enum InternalState { kNotInitialized, kIdle, kCapturing, kError };
 
-  Name device_name_;
+  VideoCaptureDeviceDescriptor device_descriptor_;
   std::unique_ptr<VideoCaptureDevice::Client> client_;
 
   VideoCaptureFormat capture_format_;