Change MediaStreamDevicesController::RequestPermissions to use the requesting WebContents

chrome/browser/policy/policy_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
@@ skipping 3140 matching lines @@
   };
 
   MediaStreamDevicesControllerBrowserTest()
       : request_url_allowed_via_whitelist_(false),
         request_url_("https://www.example.com/foo") {
     policy_value_ = GetParam();
     prompt_delegate_.set_response_type(PermissionRequestManager::ACCEPT_ALL);
   }
   virtual ~MediaStreamDevicesControllerBrowserTest() {}
 
+  void SetUpOnMainThread() override {
+    PolicyTest::SetUpOnMainThread();
+    ui_test_utils::NavigateToURL(browser(), request_url_);
+  }
+
+  content::MediaStreamRequest CreateRequest(
+      content::MediaStreamType audio_request_type,
+      content::MediaStreamType video_request_type) {
+    content::WebContents* web_contents =
+        browser()->tab_strip_model()->GetActiveWebContents();
+    EXPECT_EQ(request_url_,
+              web_contents->GetMainFrame()->GetLastCommittedURL());
+    int render_process_id = web_contents->GetRenderProcessHost()->GetID();
+    int render_frame_id = web_contents->GetMainFrame()->GetRoutingID();
+    return content::MediaStreamRequest(
+        render_process_id, render_frame_id, 0, request_url_.GetOrigin(), false,
+        content::MEDIA_DEVICE_ACCESS, std::string(), std::string(),
+        audio_request_type, video_request_type, false);
+  }
+
   // Configure a given policy map. The |policy_name| is the name of either the
   // audio or video capture allow policy and must never be NULL.
   // |whitelist_policy| and |allow_rule| are optional.  If NULL, no whitelist
   // policy is set.  If non-NULL, the whitelist policy is set to contain either
   // the |allow_rule| (if non-NULL) or an "allow all" wildcard.
   void ConfigurePolicyMap(PolicyMap* policies, const char* policy_name,
                           const char* whitelist_policy,
                           const char* allow_rule) {
     policies->Set(policy_name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                   POLICY_SOURCE_CLOUD,
@@ skipping 23 matching lines @@
               std::unique_ptr<content::MediaStreamUI> ui) {
     if (policy_value_ || request_url_allowed_via_whitelist_) {
       ASSERT_EQ(1U, devices.size());
       ASSERT_EQ("fake_dev", devices[0].id);
     } else {
       ASSERT_EQ(0U, devices.size());
     }
   }
 
   void FinishAudioTest() {
-    content::MediaStreamRequest request(
-        0, 0, 0, request_url_.GetOrigin(), false, content::MEDIA_DEVICE_ACCESS,
-        std::string(), std::string(), content::MEDIA_DEVICE_AUDIO_CAPTURE,
-        content::MEDIA_NO_SERVICE, false);
+    content::MediaStreamRequest request(CreateRequest(
+        content::MEDIA_DEVICE_AUDIO_CAPTURE, content::MEDIA_NO_SERVICE));
     // TODO(raymes): Test MEDIA_DEVICE_OPEN (Pepper) which grants both webcam
     // and microphone permissions at the same time.
     MediaStreamDevicesController::RequestPermissionsWithDelegate(
-        browser()->tab_strip_model()->GetActiveWebContents(), request,
+        request,
         base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept,
                    base::Unretained(this)),
         &prompt_delegate_);
 
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   void FinishVideoTest() {
-    content::MediaStreamRequest request(
-        0, 0, 0, request_url_.GetOrigin(), false, content::MEDIA_DEVICE_ACCESS,
-        std::string(), std::string(), content::MEDIA_NO_SERVICE,
-        content::MEDIA_DEVICE_VIDEO_CAPTURE, false);
+    content::MediaStreamRequest request(CreateRequest(
+        content::MEDIA_NO_SERVICE, content::MEDIA_DEVICE_VIDEO_CAPTURE));
     // TODO(raymes): Test MEDIA_DEVICE_OPEN (Pepper) which grants both webcam
     // and microphone permissions at the same time.
     MediaStreamDevicesController::RequestPermissionsWithDelegate(
-        browser()->tab_strip_model()->GetActiveWebContents(), request,
+        request,
         base::Bind(&MediaStreamDevicesControllerBrowserTest::Accept,
                    base::Unretained(this)),
         &prompt_delegate_);
 
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
   TestPermissionPromptDelegate prompt_delegate_;
   bool policy_value_;
   bool request_url_allowed_via_whitelist_;
@@ skipping 1231 matching lines @@
 
   SetEmptyPolicy();
   // Policy not set.
   CheckSystemTimezoneAutomaticDetectionPolicyUnset();
   EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
   EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace policy