| Index: content/renderer/pepper/pepper_platform_camera_device.cc
|
| diff --git a/content/renderer/pepper/pepper_platform_camera_device.cc b/content/renderer/pepper/pepper_platform_camera_device.cc
|
| index 2be016f951acdc102d8cc6625556fe94d3a2af22..030135b2c675110853287d18c61c4c8777c6a99b 100644
|
| --- a/content/renderer/pepper/pepper_platform_camera_device.cc
|
| +++ b/content/renderer/pepper/pepper_platform_camera_device.cc
|
| @@ -14,14 +14,12 @@
|
| #include "content/renderer/render_frame_impl.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| #include "media/base/bind_to_current_loop.h"
|
| -#include "url/gurl.h"
|
|
|
| namespace content {
|
|
|
| PepperPlatformCameraDevice::PepperPlatformCameraDevice(
|
| int render_frame_id,
|
| const std::string& device_id,
|
| - const GURL& document_url,
|
| PepperCameraDeviceHost* handler)
|
| : render_frame_id_(render_frame_id),
|
| device_id_(device_id),
|
| @@ -35,7 +33,7 @@ PepperPlatformCameraDevice::PepperPlatformCameraDevice(
|
| PepperMediaDeviceManager* const device_manager = GetMediaDeviceManager();
|
| if (device_manager) {
|
| pending_open_device_id_ = device_manager->OpenDevice(
|
| - PP_DEVICETYPE_DEV_VIDEOCAPTURE, device_id, document_url,
|
| + PP_DEVICETYPE_DEV_VIDEOCAPTURE, device_id, handler->pp_instance(),
|
| base::Bind(&PepperPlatformCameraDevice::OnDeviceOpened,
|
| weak_factory_.GetWeakPtr()));
|
| pending_open_device_ = true;
|
|
|