| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "content/browser/frame_host/cross_process_frame_connector.h" | 10 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| (...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 570 // Make sure proxy B stays around in root and node3. | 570 // Make sure proxy B stays around in root and node3. |
| 571 EXPECT_TRUE(root->render_manager()->GetRenderFrameProxyHost( | 571 EXPECT_TRUE(root->render_manager()->GetRenderFrameProxyHost( |
| 572 site_instance_b)); | 572 site_instance_b)); |
| 573 EXPECT_TRUE(root->child_at(1)->render_manager()->GetRenderFrameProxyHost( | 573 EXPECT_TRUE(root->child_at(1)->render_manager()->GetRenderFrameProxyHost( |
| 574 site_instance_b)); | 574 site_instance_b)); |
| 575 } | 575 } |
| 576 } | 576 } |
| 577 | 577 |
| 578 // Crash a subframe and ensures its children are cleared from the FrameTree. | 578 // Crash a subframe and ensures its children are cleared from the FrameTree. |
| 579 // See http://crbug.com/338508. | 579 // See http://crbug.com/338508. |
| 580 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrashSubframe) { | 580 // TODO(creis): Disabled for flakiness; see http://crbug.com/405582. |
| 581 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrashSubframe) { |
| 581 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); | 582 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| 582 NavigateToURL(shell(), main_url); | 583 NavigateToURL(shell(), main_url); |
| 583 | 584 |
| 584 StartFrameAtDataURL(); | 585 StartFrameAtDataURL(); |
| 585 | 586 |
| 586 // These must stay in scope with replace_host. | 587 // These must stay in scope with replace_host. |
| 587 GURL::Replacements replace_host; | 588 GURL::Replacements replace_host; |
| 588 std::string foo_com("foo.com"); | 589 std::string foo_com("foo.com"); |
| 589 | 590 |
| 590 // Load cross-site page into iframe. | 591 // Load cross-site page into iframe. |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1311 params.frame_tree_node_id = child->frame_tree_node_id(); | 1312 params.frame_tree_node_id = child->frame_tree_node_id(); |
| 1312 child->navigator()->GetController()->LoadURLWithParams(params); | 1313 child->navigator()->GetController()->LoadURLWithParams(params); |
| 1313 nav_observer.Wait(); | 1314 nav_observer.Wait(); |
| 1314 | 1315 |
| 1315 // Verify that the navigation succeeded and the expected URL was loaded. | 1316 // Verify that the navigation succeeded and the expected URL was loaded. |
| 1316 EXPECT_TRUE(observer.last_navigation_succeeded()); | 1317 EXPECT_TRUE(observer.last_navigation_succeeded()); |
| 1317 EXPECT_EQ(url, observer.last_navigation_url()); | 1318 EXPECT_EQ(url, observer.last_navigation_url()); |
| 1318 } | 1319 } |
| 1319 | 1320 |
| 1320 } // namespace content | 1321 } // namespace content |
| OLD | NEW |