| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/site_per_process_browsertest.h" | 5 #include "content/browser/site_per_process_browsertest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 5978 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5989 foo_root->current_frame_host(), | 5989 foo_root->current_frame_host(), |
| 5990 "domAutomationController.send(document.origin)", | 5990 "domAutomationController.send(document.origin)", |
| 5991 &popup_origin)); | 5991 &popup_origin)); |
| 5992 EXPECT_EQ(b_url.GetOrigin().spec(), popup_origin + "/"); | 5992 EXPECT_EQ(b_url.GetOrigin().spec(), popup_origin + "/"); |
| 5993 } | 5993 } |
| 5994 | 5994 |
| 5995 // Tests that the WebContents is notified when passive mixed content is | 5995 // Tests that the WebContents is notified when passive mixed content is |
| 5996 // displayed in an OOPIF. The test ignores cert errors so that an HTTPS | 5996 // displayed in an OOPIF. The test ignores cert errors so that an HTTPS |
| 5997 // iframe can be loaded from a site other than localhost (the | 5997 // iframe can be loaded from a site other than localhost (the |
| 5998 // EmbeddedTestServer serves a certificate that is valid for localhost). | 5998 // EmbeddedTestServer serves a certificate that is valid for localhost). |
| 5999 // This test crashes on Windows under Dr. Memory, see https://crbug.com/600942. |
| 6000 #if defined(OS_WIN) |
| 6001 #define MAYBE_PassiveMixedContentInIframe DISABLED_PassiveMixedContentInIframe |
| 6002 #else |
| 6003 #define MAYBE_PassiveMixedContentInIframe PassiveMixedContentInIframe |
| 6004 #endif |
| 5999 IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest, | 6005 IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest, |
| 6000 PassiveMixedContentInIframe) { | 6006 MAYBE_PassiveMixedContentInIframe) { |
| 6001 net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); | 6007 net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); |
| 6002 https_server.ServeFilesFromSourceDirectory("content/test/data"); | 6008 https_server.ServeFilesFromSourceDirectory("content/test/data"); |
| 6003 ASSERT_TRUE(https_server.Start()); | 6009 ASSERT_TRUE(https_server.Start()); |
| 6004 SetupCrossSiteRedirector(&https_server); | 6010 SetupCrossSiteRedirector(&https_server); |
| 6005 | 6011 |
| 6006 GURL iframe_url( | 6012 GURL iframe_url( |
| 6007 https_server.GetURL("/mixed-content/basic-passive-in-iframe.html")); | 6013 https_server.GetURL("/mixed-content/basic-passive-in-iframe.html")); |
| 6008 EXPECT_TRUE(NavigateToURL(shell(), iframe_url)); | 6014 EXPECT_TRUE(NavigateToURL(shell(), iframe_url)); |
| 6009 EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent()); | 6015 EXPECT_TRUE(shell()->web_contents()->DisplayedInsecureContent()); |
| 6010 | 6016 |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6310 EXPECT_EQ(b_url, root->current_url()); | 6316 EXPECT_EQ(b_url, root->current_url()); |
| 6311 | 6317 |
| 6312 // Verify that the same RenderViewHost is preserved and that it is no longer | 6318 // Verify that the same RenderViewHost is preserved and that it is no longer |
| 6313 // in swapped out state. | 6319 // in swapped out state. |
| 6314 EXPECT_EQ(rvh, contents->GetFrameTree()->GetRenderViewHost( | 6320 EXPECT_EQ(rvh, contents->GetFrameTree()->GetRenderViewHost( |
| 6315 root->current_frame_host()->GetSiteInstance())); | 6321 root->current_frame_host()->GetSiteInstance())); |
| 6316 EXPECT_FALSE(rvh->is_swapped_out_); | 6322 EXPECT_FALSE(rvh->is_swapped_out_); |
| 6317 } | 6323 } |
| 6318 | 6324 |
| 6319 } // namespace content | 6325 } // namespace content |
| OLD | NEW |