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 a5d7107201ef746f2a5b1fe0c29ec6d337527936..ecc7acb16ce8af7cdab51b1b4e9cad915519a1d6 100644 |
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc |
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc |
@@ -69,11 +69,6 @@ class MediaStreamPermissionTest : public WebRtcTestBase { |
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
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 |
@@ -133,35 +128,6 @@ IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, |
} |
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())); |
@@ -171,16 +137,6 @@ IN_PROC_BROWSER_TEST_F(MediaStreamPermissionTest, |
} |
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())); |