Change MediaStreamDevicesController::RequestPermissions to use the requesting WebContents

chrome/browser/permissions/permission_request_manager_browsertest.cc

 // Copyright 2015 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 "chrome/browser/permissions/permission_request_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_request.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_request_impl.h"
 #include "chrome/browser/permissions/permission_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/variations/variations_associated_data.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace test {
 class MediaStreamDevicesControllerTestApi
     : public internal::PermissionPromptDelegate {
  public:
   static void AddRequestToManager(
       PermissionRequestManager* manager,
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) {
     MediaStreamDevicesControllerTestApi delegate(manager);
     MediaStreamDevicesController::RequestPermissionsWithDelegate(
-        web_contents, request, callback, &delegate);
+        request, callback, &delegate);
   }
 
  private:
   // MediaStreamDevicesController::PermissionPromptDelegate:
   void ShowPrompt(
       bool user_gesture,
       content::WebContents* web_contents,
       std::unique_ptr<MediaStreamDevicesController> controller) override {
     manager_->AddRequest(controller.release());
   }
@@ skipping 65 matching lines @@
 class PermissionDialogTest
     : public SupportsTestDialog<PermissionRequestManagerBrowserTest> {
  public:
   PermissionDialogTest() {}
 
   // InProcessBrowserTest:
   void SetUpOnMainThread() override {
     // Skip super: It will install a mock permission UI factory, but for this
     // test we want to show "real" UI.
     InProcessBrowserTest::SetUpOnMainThread();
+    ui_test_utils::NavigateToURL(browser(), GetUrl());
   }
 
  private:
   GURL GetUrl() { return GURL("https://example.com"); }
 
   PermissionRequest* MakeRegisterProtocolHandlerRequest();
   void AddMediaRequest(PermissionRequestManager* manager,
                        ContentSettingsType permission);
   PermissionRequest* MakePermissionRequest(ContentSettingsType permission);
 
@@ skipping 26 matching lines @@
   content::MediaStreamRequestType request_type = content::MEDIA_DEVICE_ACCESS;
   content::MediaStreamType audio_type = content::MEDIA_NO_SERVICE;
   content::MediaStreamType video_type = content::MEDIA_NO_SERVICE;
   std::string audio_id = "audio_id";
   std::string video_id = "video_id";
 
   if (permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC)
     audio_type = content::MEDIA_DEVICE_AUDIO_CAPTURE;
   else
     video_type = content::MEDIA_DEVICE_VIDEO_CAPTURE;
-  content::MediaStreamRequest request(0, 0, 0, GetUrl(), false, request_type,
-                                      audio_id, video_id, audio_type,
-                                      video_type, false);
+  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
+  int render_frame_id = web_contents->GetMainFrame()->GetRoutingID();
+  content::MediaStreamRequest request(render_process_id, render_frame_id, 0,
+                                      GetUrl(), false, request_type, audio_id,
+                                      video_id, audio_type, video_type, false);
 
   // Add fake devices, otherwise the request will auto-block.
   MediaCaptureDevicesDispatcher::GetInstance()->SetTestAudioCaptureDevices(
       content::MediaStreamDevices(
           1, content::MediaStreamDevice(content::MEDIA_DEVICE_AUDIO_CAPTURE,
                                         audio_id, "Fake Audio")));
   MediaCaptureDevicesDispatcher::GetInstance()->SetTestVideoCaptureDevices(
       content::MediaStreamDevices(
           1, content::MediaStreamDevice(content::MEDIA_DEVICE_VIDEO_CAPTURE,
                                         video_id, "Fake Video")));
@@ skipping 305 matching lines @@
 #define MAYBE_InvokeDialog_protected_media InvokeDialog_protected_media
 #else
 #define MAYBE_InvokeDialog_protected_media DISABLED_InvokeDialog_protected_media
 #endif
 IN_PROC_BROWSER_TEST_F(PermissionDialogTest,
                        MAYBE_InvokeDialog_protected_media) {
   RunDialog();
 }
 
 }  // anonymous namespace