Refactor the VideoCaptureDevice::Name struct.

content/browser/renderer_host/media/web_contents_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.
 //
 // Implementation notes: This needs to work on a variety of hardware
 // configurations where the speed of the CPU and GPU greatly affect overall
 // performance. Spanning several threads, the process of capturing has been
 // split up into four conceptual stages:
 //
 //   1. Reserve Buffer: Before a frame can be captured, a slot in the consumer's
@@ skipping 1219 matching lines @@
 media::VideoCaptureDevice* WebContentsVideoCaptureDevice::Create(
     const std::string& device_id) {
   // Parse device_id into render_process_id and render_view_id.
   int render_process_id = -1;
   int render_view_id = -1;
   if (!WebContentsCaptureUtil::ExtractTabCaptureTarget(device_id,
                                                        &render_process_id,
                                                        &render_view_id))
     return NULL;
 
-  media::VideoCaptureDevice::Name name;
-  base::SStringPrintf(&name.device_name,
+  std::string device_name;
+  base::SStringPrintf(&device_name,
                       "WebContents[%.*s]",
                       static_cast<int>(device_id.size()), device_id.data());
-  name.unique_id = device_id;
-
   return new WebContentsVideoCaptureDevice(
-      name, render_process_id, render_view_id);
+      media::VideoCaptureDevice::Name(device_name, device_id),
+      render_process_id, render_view_id);
 }
 
 void WebContentsVideoCaptureDevice::Allocate(
     int width, int height, int frame_rate,
     VideoCaptureDevice::EventHandler* consumer) {
   impl_->Allocate(width, height, frame_rate, consumer);
 }
 
 void WebContentsVideoCaptureDevice::Start() {
   impl_->Start();
 }
 
 void WebContentsVideoCaptureDevice::Stop() {
   impl_->Stop();
 }
 
 void WebContentsVideoCaptureDevice::DeAllocate() {
   impl_->DeAllocate();
 }
 
 const media::VideoCaptureDevice::Name&
 WebContentsVideoCaptureDevice::device_name() {
   return device_name_;
 }
 
 }  // namespace content