Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/mac/video_capture_device_avfoundation_mac.mm

 // Copyright 2013 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.
 
 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
 
 #import <CoreMedia/CoreMedia.h>
 #import <CoreVideo/CoreVideo.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 147 matching lines @@
 
 + (NSDictionary*)deviceNames {
   NSMutableDictionary* deviceNames =
       [[[NSMutableDictionary alloc] init] autorelease];
   // The device name retrieval is not going to happen in the main thread, and
   // this might cause instabilities (it did in QTKit), so keep an eye here.
   [self getDeviceNames:deviceNames];
   return deviceNames;
 }
 
-+ (void)getDevice:(const media::VideoCaptureDevice::Name&)name
- supportedFormats:(media::VideoCaptureFormats*)formats {
++ (void)getDevice:(const media::VideoCaptureDeviceDescriptor&)descriptor
+    supportedFormats:(media::VideoCaptureFormats*)formats {
   NSArray* devices = [AVCaptureDeviceGlue devices];
   CrAVCaptureDevice* device = nil;
   for (device in devices) {
-    if ([[device uniqueID] UTF8String] == name.id())
+    if ([[device uniqueID] UTF8String] == descriptor.device_id)
       break;
   }
   if (device == nil)
     return;
   for (CrAVCaptureDeviceFormat* format in device.formats) {
     // MediaSubType is a CMPixelFormatType but can be used as CVPixelFormatType
     // as well according to CMFormatDescription.h
     const media::VideoPixelFormat pixelFormat = FourCCToChromiumPixelFormat(
         CoreMediaGlue::CMFormatDescriptionGetMediaSubType(
             [format formatDescription]));
 
     CoreMediaGlue::CMVideoDimensions dimensions =
         CoreMediaGlue::CMVideoFormatDescriptionGetDimensions(
             [format formatDescription]);
 
     for (CrAVFrameRateRange* frameRate in
          [format videoSupportedFrameRateRanges]) {
       media::VideoCaptureFormat format(
           gfx::Size(dimensions.width, dimensions.height),
           frameRate.maxFrameRate, pixelFormat);
       formats->push_back(format);
-      DVLOG(2) << name.name() << " "
+      DVLOG(2) << descriptor.display_name << " "
                << media::VideoCaptureFormat::ToString(format);
     }
   }
 }
 
 #pragma mark Public methods
 
 - (id)initWithFrameReceiver:(media::VideoCaptureDeviceMac*)frameReceiver {
   if ((self = [super init])) {
     DCHECK(main_thread_checker_.CalledOnValidThread());
@@ skipping 297 matching lines @@
 }
 
 - (void)sendErrorString:(NSString*)error {
   DLOG(ERROR) << [error UTF8String];
   base::AutoLock lock(lock_);
   if (frameReceiver_)
     frameReceiver_->ReceiveError(FROM_HERE, [error UTF8String]);
 }
 
 @end