| 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 3311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3322 " 'csp', '%s');", | 3322 " 'csp', '%s');", |
| 3323 csp_values[i].c_str()))); | 3323 csp_values[i].c_str()))); |
| 3324 | 3324 |
| 3325 NavigateFrameToURL(child, urls[i]); | 3325 NavigateFrameToURL(child, urls[i]); |
| 3326 EXPECT_EQ(csp_values[i], child->frame_owner_properties().required_csp); | 3326 EXPECT_EQ(csp_values[i], child->frame_owner_properties().required_csp); |
| 3327 // TODO(amalika): add checks that the CSP replication takes effect | 3327 // TODO(amalika): add checks that the CSP replication takes effect |
| 3328 } | 3328 } |
| 3329 } | 3329 } |
| 3330 | 3330 |
| 3331 // Verify origin replication with an A-embed-B-embed-C-embed-A hierarchy. | 3331 // Verify origin replication with an A-embed-B-embed-C-embed-A hierarchy. |
| 3332 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OriginReplication) { | 3332 // Disabled due to flake on multiple platforms: https://crbug.com/692864. |
| 3333 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_OriginReplication) { |
| 3333 GURL main_url(embedded_test_server()->GetURL( | 3334 GURL main_url(embedded_test_server()->GetURL( |
| 3334 "a.com", "/cross_site_iframe_factory.html?a(b(c(a),b), a)")); | 3335 "a.com", "/cross_site_iframe_factory.html?a(b(c(a),b), a)")); |
| 3335 EXPECT_TRUE(NavigateToURL(shell(), main_url)); | 3336 EXPECT_TRUE(NavigateToURL(shell(), main_url)); |
| 3336 | 3337 |
| 3337 // It is safe to obtain the root frame tree node here, as it doesn't change. | 3338 // It is safe to obtain the root frame tree node here, as it doesn't change. |
| 3338 FrameTreeNode* root = web_contents()->GetFrameTree()->root(); | 3339 FrameTreeNode* root = web_contents()->GetFrameTree()->root(); |
| 3339 | 3340 |
| 3340 EXPECT_EQ( | 3341 EXPECT_EQ( |
| 3341 " Site A ------------ proxies for B C\n" | 3342 " Site A ------------ proxies for B C\n" |
| 3342 " |--Site B ------- proxies for A C\n" // tiptop_child | 3343 " |--Site B ------- proxies for A C\n" // tiptop_child |
| (...skipping 5990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 9333 "subframes_with_resources.html?urls=%s,%s&" | 9334 "subframes_with_resources.html?urls=%s,%s&" |
| 9334 "numSubresources=3", | 9335 "numSubresources=3", |
| 9335 path0.c_str(), path1.c_str()))); | 9336 path0.c_str(), path1.c_str()))); |
| 9336 EXPECT_TRUE(NavigateToURL(shell(), url)); | 9337 EXPECT_TRUE(NavigateToURL(shell(), url)); |
| 9337 bool result; | 9338 bool result; |
| 9338 EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(), "createFrames()", &result)); | 9339 EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(), "createFrames()", &result)); |
| 9339 EXPECT_TRUE(result); | 9340 EXPECT_TRUE(result); |
| 9340 } | 9341 } |
| 9341 | 9342 |
| 9342 } // namespace content | 9343 } // namespace content |
| OLD | NEW |