Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/video_capture_device_factory.cc

Index: media/capture/video/video_capture_device_factory.cc
diff --git a/media/capture/video/video_capture_device_factory.cc b/media/capture/video/video_capture_device_factory.cc
index 39aa62aba6fa0d0eda0c4511f781cd3ab754e3a4..adee43865fa7ad1d91d513c3526dbdb63b085de4 100644
--- a/media/capture/video/video_capture_device_factory.cc
+++ b/media/capture/video/video_capture_device_factory.cc
@@ -42,18 +42,17 @@ VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
   thread_checker_.DetachFromThread();
 }
 
-VideoCaptureDeviceFactory::~VideoCaptureDeviceFactory() {
-}
+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) && \