| Index: content/renderer/pepper/pepper_media_device_manager.cc
|
| diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc
|
| index 731a3093fcb811594cfe6852afa53b23abbd9ebb..7ebf5054dfae0d21226aa73e3ce1d2fe4c2d0aed 100644
|
| --- a/content/renderer/pepper/pepper_media_device_manager.cc
|
| +++ b/content/renderer/pepper/pepper_media_device_manager.cc
|
| @@ -81,7 +81,6 @@ PepperMediaDeviceManager::~PepperMediaDeviceManager() {
|
|
|
| void PepperMediaDeviceManager::EnumerateDevices(
|
| PP_DeviceType_Dev type,
|
| - const GURL& document_url,
|
| const DevicesCallback& callback) {
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| bool request_audio_input = type == PP_DEVICETYPE_DEV_AUDIOCAPTURE;
|
| @@ -90,7 +89,6 @@ void PepperMediaDeviceManager::EnumerateDevices(
|
| CHECK(request_audio_input || request_video_input || request_audio_output);
|
| GetMediaDevicesDispatcher()->EnumerateDevices(
|
| request_audio_input, request_video_input, request_audio_output,
|
| - url::Origin(document_url.GetOrigin()),
|
| base::Bind(&PepperMediaDeviceManager::DevicesEnumerated, AsWeakPtr(),
|
| callback, ToMediaDeviceType(type)));
|
| #else
|
| @@ -103,13 +101,12 @@ void PepperMediaDeviceManager::EnumerateDevices(
|
|
|
| uint32_t PepperMediaDeviceManager::StartMonitoringDevices(
|
| PP_DeviceType_Dev type,
|
| - const GURL& document_url,
|
| const DevicesCallback& callback) {
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| base::WeakPtr<MediaDevicesEventDispatcher> event_dispatcher =
|
| MediaDevicesEventDispatcher::GetForRenderFrame(render_frame());
|
| return event_dispatcher->SubscribeDeviceChangeNotifications(
|
| - ToMediaDeviceType(type), url::Origin(document_url.GetOrigin()),
|
| + ToMediaDeviceType(type),
|
| base::Bind(&PepperMediaDeviceManager::DevicesChanged, AsWeakPtr(),
|
| callback));
|
| #else
|
|
|