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

chrome/browser/media/chrome_media_stream_infobar_browsertest.cc

Index: chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
index 395641f798ea678eadebd92ae54eed87460aa915..017f937c351f18d3ab3b953947555e78167084e8 100644
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
@@ -22,15 +22,19 @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/media_stream_request.h"
+#include "content/public/common/origin_util.h"
 #include "content/public/test/browser_test_utils.h"
 #include "media/base/media_switches.h"
+#include "net/dns/mock_host_resolver.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 // MediaStreamPermissionTest ---------------------------------------------------
 
 class MediaStreamPermissionTest : public WebRtcTestBase {
  public:
-  MediaStreamPermissionTest() {}
+  // The default test server is localhost, which is considered secure:
+  // https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features
+  MediaStreamPermissionTest() : use_secure_origin_for_test_page_(true) {}
   ~MediaStreamPermissionTest() override {}
 
   // InProcessBrowserTest:
@@ -67,11 +71,33 @@ class MediaStreamPermissionTest : public WebRtcTestBase {
     return result.compare("ok-stopped") == 0;
   }
 
+  void useNonSecureOriginForTestPage() {
+    use_secure_origin_for_test_page_ = false;
+    host_resolver()->AddRule("*", "127.0.0.1");
+  }
+
  private:
+  bool use_secure_origin_for_test_page_;
+
   content::WebContents* LoadTestPageInBrowser(Browser* browser) {
     EXPECT_TRUE(test_server()->Start());
 
-    ui_test_utils::NavigateToURL(browser, test_page_url());
+    GURL url;
+
+    if (use_secure_origin_for_test_page_) {
+      // Uses the default server.
+      url = test_page_url();
+    } else {
+      static const char kFoo[] = "not-secure.example.com";
+      GURL::Replacements replacements;
+      replacements.SetSchemeStr(url::kHttpScheme);
+      replacements.SetHostStr(kFoo);
+      url = test_page_url().ReplaceComponents(replacements);
+    }
+
+    EXPECT_EQ(use_secure_origin_for_test_page_, content::IsOriginSecure(url));
+
+    ui_test_utils::NavigateToURL(browser, url);
     return browser->tab_strip_model()->GetActiveWebContents();
   }
 
@@ -87,27 +113,27 @@ class MediaStreamPermissionTest : public WebRtcTestBase {
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestAllowingUserMedia) {
   content::WebContents* tab_contents = LoadTestPageInTab();
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_SHOWN));
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDenyingUserMedia) {
   content::WebContents* tab_contents = LoadTestPageInTab();
-  GetUserMediaAndDeny(tab_contents);
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDismissingRequest) {
   content::WebContents* tab_contents = LoadTestPageInTab();
-  GetUserMediaAndDismiss(tab_contents);
+  GetUserMediaAndDismiss(tab_contents, EXPECT_PROMPT_SHOWN);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        TestDenyingUserMediaIncognito) {
   content::WebContents* tab_contents = LoadTestPageInIncognitoTab();
-  GetUserMediaAndDeny(tab_contents);
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
-                       TestAcceptThenDenyWhichShouldBeSticky) {
+                       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(
@@ -115,41 +141,71 @@ IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
     return;
 #endif
 
+  useNonSecureOriginForTestPage();
   content::WebContents* tab_contents = LoadTestPageInTab();
+  EXPECT_FALSE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
 
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-  GetUserMediaAndDeny(tab_contents);
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_SHOWN));
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
 
-  // Should fail with permission denied, instead of hanging.
-  GetUserMedia(tab_contents, kAudioVideoCallConstraints);
+  GetUserMedia(tab_contents, kAudioVideoCallConstraints,
+               EXPECT_PROMPT_NOT_SHOWN);
   EXPECT_TRUE(test::PollingWaitUntil("obtainGetUserMediaResult()",
                                      kFailedWithPermissionDeniedError,
                                      tab_contents));
 }
 
-IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestAcceptIsNotSticky) {
+IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
+                       TestNonSecureOriginDenyIsSticky) {
+  useNonSecureOriginForTestPage();
+  content::WebContents* tab_contents = LoadTestPageInTab();
+  EXPECT_FALSE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
+
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN));

[felt, 2015/08/04 13:42:26]

This seems weird. The name of the method is GetUserMediaAndAccept, but you're
expecting that the prompt won't be shown, so there is nothing to accept? Could
you make a new method instead for the cases where a prompt is not supposed to be
shown?

[lgarron, 2015/08/04 18:02:41]

Hmm, I didn't want to create 2 (or 3) methods for all the existing
GetUserMedia[WithSpecificConstrains][AndAcccept/AndDeny] helper methods. How
about calling them something like TryGetUserMedia...()?

[lgarron, 2015/08/04 20:15:44]

After poking around a bit, I found that just adding two
GetUserMediaAndExpectAuto{Accept/Deny}WithoutPrompt() methods and doing the
prompt expectation checks in each helper method works quite well. Thanks for
pointing out the weirdness. :-)

+}
+
+IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
+                       TestSecureOriginDenyIsSticky) {
+  content::WebContents* tab_contents = LoadTestPageInTab();
+  EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
+
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
+  EXPECT_FALSE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN));
+}
+
+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_PROMPT_SHOWN));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_SHOWN));
+}
+
+IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
+                       TestSecureOriginAcceptIsSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
+  EXPECT_TRUE(content::IsOriginSecure(tab_contents->GetLastCommittedURL()));
 
-  // If accept were sticky the second call would hang because it hangs if a
-  // bubble does not pop up.
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
-  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_SHOWN));
+  EXPECT_TRUE(GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN));
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, TestDismissIsNotSticky) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
-  // If dismiss were sticky the second call would hang because it hangs if a
-  // bubble does not pop up.
-  GetUserMediaAndDismiss(tab_contents);
-  GetUserMediaAndDismiss(tab_contents);
+  GetUserMediaAndDismiss(tab_contents, EXPECT_PROMPT_SHOWN);
+  GetUserMediaAndDismiss(tab_contents, EXPECT_PROMPT_SHOWN);
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        TestDenyingThenClearingStickyException) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
-  GetUserMediaAndDeny(tab_contents);
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
+  GetUserMediaAndAccept(tab_contents, EXPECT_PROMPT_NOT_SHOWN);
 
   HostContentSettingsMap* settings_map =
       browser()->profile()->GetHostContentSettingsMap();
@@ -158,8 +214,7 @@ IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
   settings_map->ClearSettingsForOneType(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
 
-  // If a bubble is not launched now, this will hang.
-  GetUserMediaAndDeny(tab_contents);
+  GetUserMediaAndDeny(tab_contents, EXPECT_PROMPT_SHOWN);
 }
 
 // Times out on win debug builds; http://crbug.com/295723 .
@@ -174,20 +229,18 @@ IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        MAYBE_DenyingMicDoesNotCauseStickyDenyForCameras) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
-  // If mic blocking also blocked cameras, the second call here would hang.
-  GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
-                                             kAudioOnlyCallConstraints);
+  GetUserMediaWithSpecificConstraintsAndDeny(
+      tab_contents, kAudioOnlyCallConstraints, EXPECT_PROMPT_SHOWN);
   EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
-      tab_contents, kVideoOnlyCallConstraints));
+      tab_contents, kVideoOnlyCallConstraints, EXPECT_PROMPT_SHOWN));
 }
 
 IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest,
                        DenyingCameraDoesNotCauseStickyDenyForMics) {
   content::WebContents* tab_contents = LoadTestPageInTab();
 
-  // If camera blocking also blocked mics, the second call here would hang.
-  GetUserMediaWithSpecificConstraintsAndDeny(tab_contents,
-                                             kVideoOnlyCallConstraints);
+  GetUserMediaWithSpecificConstraintsAndDeny(
+      tab_contents, kVideoOnlyCallConstraints, EXPECT_PROMPT_SHOWN);
   EXPECT_TRUE(GetUserMediaWithSpecificConstraintsAndAccept(
-      tab_contents, kAudioOnlyCallConstraints));
+      tab_contents, kAudioOnlyCallConstraints, EXPECT_PROMPT_SHOWN));
 }