Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/mac/video_capture_device_decklink_mac.h

 // Copyright 2014 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.
 
 // Implementation of VideoCaptureDevice class for Blackmagic video capture
 // devices by using the DeckLink SDK.
 
 #ifndef MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
 #define MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_
 
@@ skipping 16 matching lines @@
 }  // namespace tracked_objects
 
 namespace media {
 
 // Extension of VideoCaptureDevice to create and manipulate Blackmagic devices.
 // Creates a reference counted |decklink_capture_delegate_| that does all the
 // DeckLink SDK configuration and capture work while holding a weak reference to
 // us for sending back frames, logs and error messages.
 class CAPTURE_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice {
  public:
-  // Gets the names of all DeckLink video capture devices connected to this
+  // Gets descriptors for all DeckLink video capture devices connected to this
   // computer, as enumerated by the DeckLink SDK. To allow the user to choose
   // exactly which capture format she wants, we enumerate as many cameras as
   // capture formats.
-  static void EnumerateDevices(VideoCaptureDevice::Names* device_names);
+  static void EnumerateDevices(
+      VideoCaptureDeviceDescriptors* device_descriptors);
 
   // Gets the supported formats of a particular device attached to the system,
   // identified by |device|. Formats are retrieved from the DeckLink SDK.
   // Following the enumeration, each camera will have only one capability.
   static void EnumerateDeviceCapabilities(
-      const VideoCaptureDevice::Name& device,
+      const VideoCaptureDeviceDescriptor& descriptor,
       VideoCaptureFormats* supported_formats);
 
-  explicit VideoCaptureDeviceDeckLinkMac(const Name& device_name);
+  explicit VideoCaptureDeviceDeckLinkMac(
+      const VideoCaptureDeviceDescriptor& descriptor);
   ~VideoCaptureDeviceDeckLinkMac() override;
 
   // Copy of VideoCaptureDevice::Client::OnIncomingCapturedData(). Used by
   // |decklink_capture_delegate_| to forward captured frames.
   void OnIncomingCapturedData(const uint8_t* data,
                               size_t length,
                               const VideoCaptureFormat& frame_format,
                               int rotation,  // Clockwise.
                               base::TimeTicks reference_time,
                               base::TimeDelta timestamp);
@@ skipping 22 matching lines @@
 
   // Checks for Device (a.k.a. Audio) thread.
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceDeckLinkMac);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CAPTURE_VIDEO_MAC_VIDEO_CAPTURE_DEVICE_DECKLINK_MAC_H_