Change MediaStreamDevicesController::RequestPermissions to use the requesting WebContents

chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "base/bind.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
 #include "chrome/browser/media/webrtc/media_stream_device_permissions.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class MediaStreamDevicesControllerTest : public WebRtcTestBase {
  public:
   // TODO(raymes): When crbug.com/606138 is finished and the
   // PermissionRequestManager is used to show all prompts on Android/Desktop
   // we should remove PermissionPromptDelegate and just use
   // MockPermissionPromptFactory instead. The APIs are the same.
@@ skipping 62 matching lines @@
   const std::string& example_video_id() const { return example_video_id_; }
 
   content::MediaStreamRequestResult media_stream_result() const {
     return media_stream_result_;
   }
 
   void RequestPermissions(content::WebContents* web_contents,
                           const content::MediaStreamRequest& request,
                           const content::MediaResponseCallback& callback) {
     MediaStreamDevicesController::RequestPermissionsWithDelegate(
-        web_contents, request, callback, &prompt_delegate_);
+        request, callback, &prompt_delegate_);
   }
 
   TestPermissionPromptDelegate* prompt_delegate() { return &prompt_delegate_; }
 
   // Sets the device policy-controlled |access| for |example_url_| to be for the
   // selected |device_type|.
   void SetDevicePolicy(DeviceType device_type, Access access) {
     PrefService* prefs = Profile::FromBrowserContext(
         GetWebContents()->GetBrowserContext())->GetPrefs();
     const char* policy_name = NULL;
@@ skipping 42 matching lines @@
   content::MediaStreamRequest CreateRequestWithType(
       const std::string& audio_id,
       const std::string& video_id,
       content::MediaStreamRequestType request_type) {
     content::MediaStreamType audio_type =
         audio_id.empty() ? content::MEDIA_NO_SERVICE
                          : content::MEDIA_DEVICE_AUDIO_CAPTURE;
     content::MediaStreamType video_type =
         video_id.empty() ? content::MEDIA_NO_SERVICE
                          : content::MEDIA_DEVICE_VIDEO_CAPTURE;
-    return content::MediaStreamRequest(0, 0, 0, example_url(), false,
-                                       request_type, audio_id, video_id,
-                                       audio_type, video_type, false);
+    EXPECT_EQ(example_url(),
+              GetWebContents()->GetMainFrame()->GetLastCommittedURL());
+    int render_process_id = GetWebContents()->GetRenderProcessHost()->GetID();
+    int render_frame_id = GetWebContents()->GetMainFrame()->GetRoutingID();
+    return content::MediaStreamRequest(
+        render_process_id, render_frame_id, 0, example_url(), false,
+        request_type, audio_id, video_id, audio_type, video_type, false);
   }
 
   content::MediaStreamRequest CreateRequest(const std::string& audio_id,
                                             const std::string& video_id) {
     return CreateRequestWithType(audio_id, video_id,
                                  content::MEDIA_DEVICE_ACCESS);
   }
 
   void InitWithUrl(const GURL& url) {
     DCHECK(example_url_.is_empty());
@@ skipping 612 matching lines @@
       GetWebContents(), CreateRequest(example_audio_id(), example_video_id()),
       base::Bind(&MediaStreamDevicesControllerTest::OnMediaStreamResponse,
                  base::Unretained(this)));
 
   ASSERT_EQ(0u, prompt_delegate()->TotalRequestCount());
 
   ASSERT_EQ(content::MEDIA_DEVICE_KILL_SWITCH_ON, media_stream_result());
   ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_AUDIO_CAPTURE));
   ASSERT_FALSE(CheckDevicesListContains(content::MEDIA_DEVICE_VIDEO_CAPTURE));
 }