Setup for moving getUserMedia to secure origins only

chrome/browser/media/chrome_media_stream_infobar_browsertest.cc

 // Copyright 2013 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/files/file_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
@@ skipping 51 matching lines @@
   // Executes stopLocalStream() in the test page, which frees up an already
   // acquired mediastream.
   bool StopLocalStream(content::WebContents* tab_contents) {
     std::string result;
     bool ok = content::ExecuteScriptAndExtractString(
         tab_contents, "stopLocalStream()", &result);
     DCHECK(ok);
     return result.compare("ok-stopped") == 0;
   }
 
-  void useNonSecureOriginForTestPage() {
-    use_secure_origin_for_test_page_ = false;

[tommi (sloooow) - chröme, 2015/08/20 17:14:25]

looks like this variable isn't needed anymore and related code needs to be
updated.

[jww, 2015/08/20 18:26:07]

Good call. Done.

-    host_resolver()->AddRule("*", "127.0.0.1");
-  }
-
  private:
   // The default test server is localhost, which is considered secure:
   // http://www.w3.org/TR/powerful-features/#is-origin-trustworthy
   bool use_secure_origin_for_test_page_ = true;
 
   content::WebContents* LoadTestPageInBrowser(Browser* browser) {
     EXPECT_TRUE(test_server()->Start());
 
     GURL url;
 
@@ skipping 39 matching lines @@
   GetUserMediaAndDismiss(tab_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        TestDenyingUserMediaIncognito) {
   content::WebContents* tab_contents = LoadTestPageInIncognitoTab();
   GetUserMediaAndDeny(tab_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
-                       TestNonSecureOriginAcceptThenDenyIsSticky) {
-#if defined(OS_WIN) && defined(USE_ASH)
-  // Disable this test in Metro+Ash for now (http://crbug.com/262796).
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kAshBrowserTests))
-    return;
-#endif
-
-  useNonSecureOriginForTestPage();
-  content::WebContents* tab_contents = LoadTestPageInTab();
-  EXPECT_FALSE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
-
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-  GetUserMediaAndDeny(tab_contents);
-
-  GetUserMediaAndExpectAutoDenyWithoutPrompt(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
-                       TestNonSecureOriginDenyIsSticky) {
-  useNonSecureOriginForTestPage();
-  content::WebContents* tab_contents = LoadTestPageInTab();
-  EXPECT_FALSE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
-
-  GetUserMediaAndDeny(tab_contents);
-  GetUserMediaAndExpectAutoDenyWithoutPrompt(tab_contents);
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        TestSecureOriginDenyIsSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
   EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
 
   GetUserMediaAndDeny(tab_contents);
   GetUserMediaAndExpectAutoDenyWithoutPrompt(tab_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
-                       TestNonSecureOriginAcceptIsNotSticky) {
-  useNonSecureOriginForTestPage();
-  content::WebContents* tab_contents = LoadTestPageInTab();
-  EXPECT_FALSE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
-
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-}
-
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        TestSecureOriginAcceptIsSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
   EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
 
   EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
   GetUserMediaAndExpectAutoAcceptWithoutPrompt(tab_contents);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDismissIsNotSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
@@ skipping 31 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        DenyingCameraDoesNotCauseStickyDenyForMics) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
   GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
                                              kVideoOnlyCallConstraints);
   EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
       tab_contents, kAudioOnlyCallConstraints));
 }