| Index: content/browser/media/capture/web_contents_video_capture_device.cc
|
| diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc
|
| index e475cbd03d228c4c9ff797225706cf5fcf605d49..1f24693ec7881c1e66f043e3563b66a00f459264 100644
|
| --- a/content/browser/media/capture/web_contents_video_capture_device.cc
|
| +++ b/content/browser/media/capture/web_contents_video_capture_device.cc
|
| @@ -992,19 +992,18 @@ WebContentsVideoCaptureDevice::~WebContentsVideoCaptureDevice() {
|
| }
|
|
|
| // static
|
| -media::VideoCaptureDevice* WebContentsVideoCaptureDevice::Create(
|
| - const std::string& device_id) {
|
| +std::unique_ptr<media::VideoCaptureDevice>
|
| +WebContentsVideoCaptureDevice::Create(const std::string& device_id) {
|
| // Parse device_id into render_process_id and main_render_frame_id.
|
| - int render_process_id = -1;
|
| - int main_render_frame_id = -1;
|
| - if (!WebContentsMediaCaptureId::ExtractTabCaptureTarget(
|
| - device_id, &render_process_id, &main_render_frame_id)) {
|
| + WebContentsMediaCaptureId media_id;
|
| + if (!WebContentsMediaCaptureId::Parse(device_id, &media_id)) {
|
| return NULL;
|
| }
|
|
|
| - return new WebContentsVideoCaptureDevice(
|
| - render_process_id, main_render_frame_id,
|
| - WebContentsMediaCaptureId::IsAutoThrottlingOptionSet(device_id));
|
| + return std::unique_ptr<media::VideoCaptureDevice>(
|
| + new WebContentsVideoCaptureDevice(media_id.render_process_id,
|
| + media_id.main_render_frame_id,
|
| + media_id.enable_auto_throttling));
|
| }
|
|
|
| void WebContentsVideoCaptureDevice::AllocateAndStart(
|
|
|