Chromium Code Reviews| Index: content/browser/site_per_process_browsertest.cc |
| diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc |
| index 915ecb0ddb64fd170c1f2a70bc3eb1862b2b74fd..58bb6bd06f8570706054659177201be2e769ee01 100644 |
| --- a/content/browser/site_per_process_browsertest.cc |
| +++ b/content/browser/site_per_process_browsertest.cc |
| @@ -605,6 +605,20 @@ class SitePerProcessHighDPIBrowserTest : public SitePerProcessBrowserTest { |
| } |
| }; |
| +// SitePerProcessIgnoreCertErrorsBrowserTest |
| + |
| +class SitePerProcessIgnoreCertErrorsBrowserTest |
| + : public SitePerProcessBrowserTest { |
| + public: |
| + SitePerProcessIgnoreCertErrorsBrowserTest() {} |
| + |
| + protected: |
| + void SetUpCommandLine(base::CommandLine* command_line) override { |
| + SitePerProcessBrowserTest::SetUpCommandLine(command_line); |
| + command_line->AppendSwitch(switches::kIgnoreCertificateErrors); |
| + } |
| +}; |
| + |
| // Ensure that navigating subframes in --site-per-process mode works and the |
| // correct documents are committed. |
| IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) { |
| @@ -4857,4 +4871,86 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| EXPECT_EQ(frame_url.GetOrigin().spec(), GetDocumentOrigin(grandchild) + "/"); |
| } |
| +IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, PassiveMixedContent) { |
| + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); |
| + https_server.ServeFilesFromSourceDirectory("content/test/data"); |
| + ASSERT_TRUE(https_server.Start()); |
| + |
| + GURL url(https_server.GetURL("/mixed-content/basic-passive.html")); |
| + NavigateToURL(shell(), url); |
| + EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent()); |
| +} |
| + |
| +// Tests that the WebContents is notified when passive mixed content is |
| +// displayed in an OOPIF. The test ignores cert errors so that an HTTPS |
| +// iframe can be loaded from a site other than localhost (the |
| +// EmbeddedTestServer serves a certificate that is valid for localhost). |
| +IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest, |
| + PassiveMixedContentInIframe) { |
| + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); |
| + https_server.ServeFilesFromSourceDirectory("content/test/data"); |
| + ASSERT_TRUE(https_server.Start()); |
| + SetupCrossSiteRedirector(&https_server); |
| + |
| + GURL iframe_url( |
| + https_server.GetURL("/mixed-content/basic-passive-in-iframe.html")); |
| + NavigateToURL(shell(), iframe_url); |
|
alexmos
2016/01/20 22:43:55
nit: EXPECT_TRUE (for this and other uses of Navig
estark
2016/01/21 04:40:13
Done.
|
| + EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent()); |
| + |
| + // When the subframe navigates, the WebContents should still be marked |
| + // as having displayed insecure content. |
| + GURL navigate_url(https_server.GetURL("/title1.html")); |
|
alexmos
2016/01/20 22:43:55
nit: maybe use GetURL("b.com","/title1.html") to e
estark
2016/01/21 04:40:13
Done.
|
| + FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) |
| + ->GetFrameTree() |
| + ->root(); |
| + NavigateFrameToURL(root->child_at(0), navigate_url); |
| + EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent()); |
| + |
| + // When the main frame navigates, it should no longer be marked as |
| + // displaying insecure content. |
| + NavigateToURL(shell(), navigate_url); |
| + EXPECT_FALSE(shell()->web_contents()->DisplayedInsecureContent()); |
| +} |
| + |
| +// Tests that, when a parent frame is set to strictly block mixed |
| +// content via Content Security Policy, child OOPIFs cannot display |
| +// mixed content. |
| +IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest, |
| + PassiveMixedContentInIframeWithStrictBlocking) { |
| + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); |
| + https_server.ServeFilesFromSourceDirectory("content/test/data"); |
| + ASSERT_TRUE(https_server.Start()); |
| + SetupCrossSiteRedirector(&https_server); |
| + |
| + GURL iframe_url_with_strict_blocking(https_server.GetURL( |
| + "/mixed-content/basic-passive-in-iframe-with-strict-blocking.html")); |
| + NavigateToURL(shell(), iframe_url_with_strict_blocking); |
| + EXPECT_FALSE(shell()->web_contents()->DisplayedInsecureContent()); |
| + |
| + FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents()) |
| + ->GetFrameTree() |
| + ->root(); |
| + EXPECT_TRUE(root->current_replication_state() |
| + .should_enforce_strict_mixed_content_checking); |
| + EXPECT_TRUE(root->child_at(0) |
| + ->current_replication_state() |
| + .should_enforce_strict_mixed_content_checking); |
| + |
| + // When the subframe navigates, it should still be marked as enforcing |
| + // strict mixed content. |
| + GURL navigate_url(https_server.GetURL("/title1.html")); |
| + NavigateFrameToURL(root->child_at(0), navigate_url); |
| + EXPECT_TRUE(root->current_replication_state() |
| + .should_enforce_strict_mixed_content_checking); |
| + EXPECT_TRUE(root->child_at(0) |
| + ->current_replication_state() |
| + .should_enforce_strict_mixed_content_checking); |
| + |
| + // When the main frame navigates, it should no longer be marked as |
| + // enforcing strict mixed content. |
| + NavigateToURL(shell(), navigate_url); |
| + EXPECT_FALSE(root->current_replication_state() |
| + .should_enforce_strict_mixed_content_checking); |
| +} |
| + |
| } // namespace content |