| Index: content/browser/renderer_host/media/web_contents_video_capture_device.cc
|
| diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device.cc b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
|
| index 42868c0a85fa83fd1f4203bacbf6c4075bc5c273..5cc0f42cb7022a8178be09811912afa0f3267162 100644
|
| --- a/content/browser/renderer_host/media/web_contents_video_capture_device.cc
|
| +++ b/content/browser/renderer_host/media/web_contents_video_capture_device.cc
|
| @@ -1237,14 +1237,13 @@ media::VideoCaptureDevice* WebContentsVideoCaptureDevice::Create(
|
| &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(
|
|
|