Refactor the VideoCaptureDevice::Name struct.

media/video/capture/mac/video_capture_device_mac.mm

 // 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.
 
 #include "media/video/capture/mac/video_capture_device_mac.h"
 
 #import <QTKit/QTKit.h>
 
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 38 matching lines @@
 }
 
 namespace media {
 
 void VideoCaptureDevice::GetDeviceNames(Names* device_names) {
   // Loop through all available devices and add to |device_names|.
   device_names->clear();
 
   NSDictionary* capture_devices = [VideoCaptureDeviceQTKit deviceNames];
   for (NSString* key in capture_devices) {
-    Name name;
-    name.device_name = [[capture_devices valueForKey:key] UTF8String];
-    name.unique_id = [key UTF8String];
+    Name name([[capture_devices valueForKey:key] UTF8String],
+              [key UTF8String]);
     device_names->push_back(name);
   }
 }
 
 VideoCaptureDevice* VideoCaptureDevice::Create(const Name& device_name) {
   VideoCaptureDeviceMac* capture_device =
       new VideoCaptureDeviceMac(device_name);
   if (!capture_device->Init()) {
     LOG(ERROR) << "Could not initialize VideoCaptureDevice.";
     delete capture_device;
@@ skipping 19 matching lines @@
     return;
   }
 
   // QTKit can scale captured frame to any size requested, which would lead to
   // undesired aspect ratio change. Tries to open the camera with a natively
   // supported format and let the client to crop/pad the captured frames.
   GetBestMatchSupportedResolution(&width, &height);
 
   observer_ = observer;
   NSString* deviceId =
-      [NSString stringWithUTF8String:device_name_.unique_id.c_str()];
+      [NSString stringWithUTF8String:device_name_.id().c_str()];
 
   [capture_device_ setFrameReceiver:this];
 
   if (![capture_device_ setCaptureDevice:deviceId]) {
     SetErrorState("Could not open capture device.");
     return;
   }
   if (frame_rate < kMinFrameRate)
     frame_rate = kMinFrameRate;
   else if (frame_rate > kMaxFrameRate)
@@ skipping 48 matching lines @@
 
 const VideoCaptureDevice::Name& VideoCaptureDeviceMac::device_name() {
   return device_name_;
 }
 
 bool VideoCaptureDeviceMac::Init() {
   DCHECK_EQ(state_, kNotInitialized);
 
   Names device_names;
   GetDeviceNames(&device_names);
-  for (Names::iterator it = device_names.begin();
-       it != device_names.end();
-       ++it) {
-    if (device_name_.unique_id == it->unique_id) {
-      capture_device_ =
-          [[VideoCaptureDeviceQTKit alloc] initWithFrameReceiver:this];
-      if (!capture_device_) {
-        return false;
-      }
-      state_ = kIdle;
-      return true;
-    }
-  }
-  return false;
+  Name* found = device_names.FindById(device_name_.id());

[mcasas, 2013/06/28 07:35:30]

much cleaner!

+  if (!found)
+    return false;
+
+  capture_device_ =
+      [[VideoCaptureDeviceQTKit alloc] initWithFrameReceiver:this];
+  if (!capture_device_)
+    return false;
+
+  state_ = kIdle;
+  return true;
 }
 
 void VideoCaptureDeviceMac::ReceiveFrame(
     const uint8* video_frame,
     int video_frame_length,
     const VideoCaptureCapability& frame_info) {
   observer_->OnIncomingCapturedFrame(
       video_frame, video_frame_length, base::Time::Now(), 0, false, false);
 }
 
 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
   DLOG(ERROR) << reason;
   state_ = kError;
   observer_->OnError();
 }
 
 } // namespace media