Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/mac/video_capture_device_mac.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MacOSX implementation of generic VideoCaptureDevice, using AVFoundation as
 // native capture API. AVFoundation is available in versions 10.7 (Lion) and
 // later.
 
 #ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
 #define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
@@ skipping 36 matching lines @@
 - (NSString*)deviceName;
 - (int32_t)transportType;
 @end
 
 namespace media {
 
 // Called by VideoCaptureManager to open, close and start, stop Mac video
 // 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.
   void AllocateAndStart(
       const VideoCaptureParams& params,
       std::unique_ptr<VideoCaptureDevice::Client> client) override;
   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.
   void ReceiveFrame(const uint8_t* video_frame,
                     int video_frame_length,
                     const VideoCaptureFormat& frame_format,
                     int aspect_numerator,
                     int aspect_denominator,
                     base::TimeDelta timestamp);
 
@@ skipping 12 matching lines @@
   void LogMessage(const std::string& message);
 
  private:
   void SetErrorState(const tracked_objects::Location& from_here,
                      const std::string& reason);
   bool UpdateCaptureResolution();
 
   // 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_;
 
   // Only read and write state_ from inside this loop.
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   InternalState state_;
 
   base::scoped_nsobject<VideoCaptureDeviceAVFoundation> capture_device_;
 
   // To hold on to the TakePhotoCallback while the picture is being taken.
   std::unique_ptr<TakePhotoCallback> photo_callback_;
 
   // Used with Bind and PostTask to ensure that methods aren't called after the
   // VideoCaptureDeviceMac is destroyed.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_