Do not pass the origin to MediaDevicesDispatcherHost.

content/renderer/media/user_media_client_impl.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.
 
 #include "content/renderer/media/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 396 matching lines @@
     GetConstraintValueAsBoolean(
         current_request_info_->request().AudioConstraints(),
         &blink::WebMediaTrackConstraintSet::render_to_associated_sink,
         &enable_automatic_output_device_selection);
     current_request_info_->set_enable_automatic_output_device_selection(
         enable_automatic_output_device_selection);
 
     if (request_audio_input_devices) {
       GetMediaDevicesDispatcher()->EnumerateDevices(
           true /* audio_input */, false /* video_input */,
-          false /* audio_output */, current_request_info_->security_origin(),
+          false /* audio_output */,
           base::Bind(&UserMediaClientImpl::SelectAudioInputDevice,
                      weak_factory_.GetWeakPtr(),
                      current_request_info_->request()));
       return;
     }
   }
 
   SetupVideoInput(current_request_info_->request());
 }
 
@@ skipping 26 matching lines @@
 
   if (!user_media_request.Video()) {
     GenerateStreamForCurrentRequestInfo();
     return;
   }
   auto& video_controls = current_request_info_->stream_controls()->video;
   InitializeTrackControls(user_media_request.VideoConstraints(),
                           &video_controls);
   if (IsDeviceSource(video_controls.stream_source)) {
     GetMediaDevicesDispatcher()->GetVideoInputCapabilities(
-        current_request_info_->security_origin(),
         base::Bind(&UserMediaClientImpl::SelectVideoDeviceSettings,
                    weak_factory_.GetWeakPtr(), user_media_request));
   } else {
     base::PostTaskAndReplyWithResult(
         worker_task_runner_.get(), FROM_HERE,
         base::Bind(&SelectSettingsVideoContentCapture,
                    user_media_request.VideoConstraints(),
                    video_controls.stream_source),
         base::Bind(&UserMediaClientImpl::FinalizeSelectVideoContentSettings,
                    weak_factory_.GetWeakPtr(), user_media_request));
@@ skipping 108 matching lines @@
     // Instead, erase the request. Once the stream is generated we will stop the
     // stream if the request does not exist.
     LogUserMediaRequestWithNoResult(MEDIA_STREAM_REQUEST_EXPLICITLY_CANCELLED);
   }
 }
 
 void UserMediaClientImpl::RequestMediaDevices(
     const blink::WebMediaDevicesRequest& media_devices_request) {
   UpdateWebRTCMethodCount(WEBKIT_GET_MEDIA_DEVICES);
   DCHECK(CalledOnValidThread());
-
-  // |media_devices_request| can't be mocked, so in tests it will be empty (the
-  // underlying pointer is null). In order to use this function in a test we
-  // need to check if it isNull.
-  url::Origin security_origin;
-  if (!media_devices_request.IsNull())
-    security_origin = media_devices_request.GetSecurityOrigin();
-
   GetMediaDevicesDispatcher()->EnumerateDevices(
       true /* audio input */, true /* video input */, true /* audio output */,
-      security_origin,
       base::Bind(&UserMediaClientImpl::FinalizeEnumerateDevices,
                  weak_factory_.GetWeakPtr(), media_devices_request));
 }
 
 void UserMediaClientImpl::SetMediaDeviceChangeObserver(
     const blink::WebMediaDeviceChangeObserver& observer) {
   media_device_change_observer_ = observer;
 
   // Do nothing if setting a valid observer while already subscribed or setting
   // no observer while unsubscribed.
   if (media_device_change_observer_.IsNull() ==
       device_change_subscription_ids_.empty())
     return;
 
   base::WeakPtr<MediaDevicesEventDispatcher> event_dispatcher =
       MediaDevicesEventDispatcher::GetForRenderFrame(render_frame());
   if (media_device_change_observer_.IsNull()) {
     event_dispatcher->UnsubscribeDeviceChangeNotifications(
         device_change_subscription_ids_);
     device_change_subscription_ids_.clear();
   } else {
     DCHECK(device_change_subscription_ids_.empty());
-    url::Origin security_origin =
-        media_device_change_observer_.GetSecurityOrigin();
     device_change_subscription_ids_ =
-        event_dispatcher->SubscribeDeviceChangeNotifications(
-            security_origin, base::Bind(&UserMediaClientImpl::DevicesChanged,
-                                        weak_factory_.GetWeakPtr()));
+        event_dispatcher->SubscribeDeviceChangeNotifications(base::Bind(
+            &UserMediaClientImpl::DevicesChanged, weak_factory_.GetWeakPtr()));
   }
 }
 
 // Callback from MediaStreamDispatcher.
 // The requested stream have been generated by the MediaStreamDispatcher.
 void UserMediaClientImpl::OnStreamGenerated(
     int request_id,
     const std::string& label,
     const StreamDeviceInfoArray& audio_array,
     const StreamDeviceInfoArray& video_array) {
@@ skipping 749 matching lines @@
     const blink::WebString& result_name) {
   // Check if we're waiting to be notified of this source.  If not, then we'll
   // ignore the notification.
   auto found = std::find(sources_waiting_for_callback_.begin(),
                          sources_waiting_for_callback_.end(), source);
   if (found != sources_waiting_for_callback_.end())
     OnTrackStarted(source, result, result_name);
 }
 
 }  // namespace content