Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1708)

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2167513002: Remove InsecureContentInfobarDelegate, which has been broken for a while (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/command_line_pref_store.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 2d93d117ed3b5e28b2e1305a2a679a5e03933c2a..ab1985880367a6d9031f96ceb688ad936a5b7cb7 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -606,16 +606,6 @@ class SSLUITest
DISALLOW_COPY_AND_ASSIGN(SSLUITest);
};
-class SSLUITestBlock : public SSLUITest {
- public:
- SSLUITestBlock() : SSLUITest() {}
-
- // Browser will neither run nor display insecure content.
- void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitch(switches::kNoDisplayingInsecureContent);
- }
-};
-
class SSLUITestIgnoreCertErrors : public SSLUITest {
public:
SSLUITestIgnoreCertErrors() : SSLUITest() {}
@@ -2344,29 +2334,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeImageWithUserException) {
EXPECT_GT(img_width, 100);
}
-// Test that when the browser blocks displaying insecure content (images), the
-// indicator shows a secure page, because the blocking made the otherwise
-// unsafe page safe (the notification of this state is handled by other means).
-IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureImage) {
- ASSERT_TRUE(embedded_test_server()->Start());
- ASSERT_TRUE(https_server_.Start());
-
- std::string replacement_path;
- GetFilePathWithHostAndPortReplacement(
- "/ssl/page_displays_insecure_content.html",
- embedded_test_server()->host_port_pair(), &replacement_path);
-
- ui_test_utils::NavigateToURL(browser(),
- https_server_.GetURL(replacement_path));
-
- CheckAuthenticatedState(browser()->tab_strip_model()->GetActiveWebContents(),
- AuthState::NONE);
-}
-
// Test that when the browser blocks displaying insecure content (iframes), the
// indicator shows a secure page, because the blocking made the otherwise
// unsafe page safe (the notification of this state is handled by other means)
-IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureIframe) {
felt 2016/07/19 21:46:59 A note for posterity: TestBlockDisplayingInsecureI
+IN_PROC_BROWSER_TEST_F(SSLUITest, TestBlockDisplayingInsecureIframe) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
@@ -2385,7 +2356,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureIframe) {
// Test that when the browser blocks running insecure content, the
// indicator shows a secure page, because the blocking made the otherwise
// unsafe page safe (the notification of this state is handled by other means).
-IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockRunningInsecureContent) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, TestBlockRunningInsecureContent) {
ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(https_server_.Start());
« no previous file with comments | « chrome/browser/prefs/command_line_pref_store.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698