Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/media/chrome_webrtc_getmediadevices_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 "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 192 matching lines @@
 // MediaDevices.enumerateDevices. http://crbug.com/388648.
 // Disabled, fails due to http://crbug.com/382391.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
                        DISABLED_GetMediaDevicesWithAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(GetUserMediaAndAccept(tab));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab, IGNORE_PROMPT_BEHAVIOUR));
 
   std::vector<MediaDeviceInfo> devices;
   GetMediaDevices(tab, &devices);
 
   // Labels should be non-empty if access has been allowed.
   for (std::vector<MediaDeviceInfo>::iterator it = devices.begin();
        it != devices.end(); ++it) {
     EXPECT_TRUE(!it->label.empty());
   }
 }
@@ skipping 36 matching lines @@
 // MediaDevices.enumerateDevices. http://crbug.com/388648.
 // Disabled, fails due to http://crbug.com/382391.
 IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,
                        DISABLED_GetMediaDevicesEqualsGetSourcesWithAccess) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   ui_test_utils::NavigateToURL(browser(), url);
   content::WebContents* tab =
       browser()->tab_strip_model()->GetActiveWebContents();
 
-  EXPECT_TRUE(GetUserMediaAndAccept(tab));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab, IGNORE_PROMPT_BEHAVIOUR));
 
   std::vector<MediaDeviceInfo> devices;
   GetMediaDevices(tab, &devices);
 
   std::vector<MediaDeviceInfo> sources;
   GetSources(tab, &sources);
 
   std::vector<MediaDeviceInfo>::iterator sources_it = sources.begin();
   for (std::vector<MediaDeviceInfo>::iterator devices_it = devices.begin();
        devices_it != devices.end(); ++devices_it) {
     if (devices_it->kind == kDeviceKindAudioOutput)
       continue;
     EXPECT_STREQ(devices_it->device_id.c_str(), sources_it->device_id.c_str());
     if (devices_it->kind == kDeviceKindAudioInput) {
       EXPECT_STREQ(kSourceKindAudioInput, sources_it->kind.c_str());
     } else {
       EXPECT_STREQ(kSourceKindVideoInput, sources_it->kind.c_str());
     }
     EXPECT_TRUE(!devices_it->label.empty());
     EXPECT_STREQ(devices_it->label.c_str(), sources_it->label.c_str());
     ++sources_it;
   }
   EXPECT_EQ(sources.end(), sources_it);
 }