Refactor the VideoCaptureDevice::Name struct.

media/video/capture/fake_video_capture_device.cc

 // 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/fake_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace media {
 
 static const int kFakeCaptureTimeoutMs = 50;
 static const int kFakeCaptureBeepCycle = 20;  // Visual beep every 1s.
 enum { kNumberOfFakeDevices = 2 };
 
 bool FakeVideoCaptureDevice::fail_next_create_ = false;
 
 void FakeVideoCaptureDevice::GetDeviceNames(Names* const device_names) {
   // Empty the name list.
   device_names->erase(device_names->begin(), device_names->end());
 
   for (int n = 0; n < kNumberOfFakeDevices; n++) {
-    Name name;
-    name.unique_id = base::StringPrintf("/dev/video%d", n);
-    name.device_name = base::StringPrintf("fake_device_%d", n);
+    Name name(base::StringPrintf("fake_device_%d", n),
+              base::StringPrintf("/dev/video%d", n));
     device_names->push_back(name);
   }
 }
 
 VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
   if (fail_next_create_) {
     fail_next_create_ = false;
     return NULL;
   }
   for (int n = 0; n < kNumberOfFakeDevices; ++n) {
     std::string possible_id = base::StringPrintf("/dev/video%d", n);
-    if (device_name.unique_id.compare(possible_id) == 0) {
+    if (device_name.id().compare(possible_id) == 0) {
       return new FakeVideoCaptureDevice(device_name);
     }
   }
   return NULL;
 }
 
 void FakeVideoCaptureDevice::SetFailNextCreate() {
   fail_next_create_ = true;
 }
 
@@ skipping 141 matching lines @@
       fake_frame_.get(), frame_size_, base::Time::Now(), 0, false, false);
   // Reschedule next CaptureTask.
   capture_thread_.message_loop()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&FakeVideoCaptureDevice::OnCaptureTask,
                    base::Unretained(this)),
         base::TimeDelta::FromMilliseconds(kFakeCaptureTimeoutMs));
 }
 
 }  // namespace media