| 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..39e4f6b1bb17263ce205d8da08d6df08977ebf4d 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -610,9 +610,10 @@ class SSLUITestBlock : public SSLUITest {
|
| public:
|
| SSLUITestBlock() : SSLUITest() {}
|
|
|
| - // Browser will neither run nor display insecure content.
|
| + // Browser will not run insecure content.
|
| void SetUpCommandLine(base::CommandLine* command_line) override {
|
| - command_line->AppendSwitch(switches::kNoDisplayingInsecureContent);
|
| + // By overriding SSLUITest, we won't apply the flag that allows running
|
| + // insecure content.
|
| }
|
| };
|
|
|
| @@ -2344,25 +2345,6 @@ 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)
|
|
|