Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_factory.cc

 // 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.
 
 #include "media/capture/video/video_capture_device_factory.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "build/build_config.h"
@@ skipping 27 matching lines @@
   }
 }
 
 VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
   thread_checker_.DetachFromThread();
 }
 
 VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() {
 }
 
-void VideoCaptureDeviceFactory::EnumerateDeviceNames(
-    const base::Callback<
-        void(std::unique_ptr<media::VideoCaptureDevice::Names>)>& callback) {
+void VideoCaptureDeviceFactory::EnumerateDeviceDescriptors(
+    const base::Callback<void(std::unique_ptr<VideoCaptureDeviceDescriptors>)>&
+        callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!callback.is_null());
-  std::unique_ptr<VideoCaptureDevice::Names> device_names(
-      new VideoCaptureDevice::Names());
-  GetDeviceNames(device_names.get());
-  callback.Run(std::move(device_names));
+  std::unique_ptr<VideoCaptureDeviceDescriptors> device_descriptors(
+      new VideoCaptureDeviceDescriptors());
+  GetDeviceDescriptors(device_descriptors.get());
+  callback.Run(std::move(device_descriptors));
 }
 
 #if !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_ANDROID) && \
     !defined(OS_WIN)
 // static
 VideoCaptureDeviceFactory*
 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   NOTIMPLEMENTED();
   return NULL;
 }
 #endif
 
 }  // namespace media