| 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 ->GetRenderWidgetHostViewsInTree(); | 339 ->GetRenderWidgetHostViewsInTree(); |
| 340 EXPECT_EQ(2U, views_set.size()); | 340 EXPECT_EQ(2U, views_set.size()); |
| 341 } | 341 } |
| 342 EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent()); | 342 EXPECT_EQ(proxy_to_parent, child->render_manager()->GetProxyToParent()); |
| 343 EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector()); | 343 EXPECT_TRUE(proxy_to_parent->cross_process_frame_connector()); |
| 344 EXPECT_EQ( | 344 EXPECT_EQ( |
| 345 child->current_frame_host()->render_view_host()->GetView(), | 345 child->current_frame_host()->render_view_host()->GetView(), |
| 346 proxy_to_parent->cross_process_frame_connector()->get_view_for_testing()); | 346 proxy_to_parent->cross_process_frame_connector()->get_view_for_testing()); |
| 347 } | 347 } |
| 348 | 348 |
| 349 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, NavigateRemoteFrame) { | 349 // Disabled for flaky crashing: crbug.com/446575 |
| 350 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| 351 DISABLED_NavigateRemoteFrame) { |
| 350 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); | 352 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| 351 NavigateToURL(shell(), main_url); | 353 NavigateToURL(shell(), main_url); |
| 352 | 354 |
| 353 // It is safe to obtain the root frame tree node here, as it doesn't change. | 355 // It is safe to obtain the root frame tree node here, as it doesn't change. |
| 354 FrameTreeNode* root = | 356 FrameTreeNode* root = |
| 355 static_cast<WebContentsImpl*>(shell()->web_contents())-> | 357 static_cast<WebContentsImpl*>(shell()->web_contents())-> |
| 356 GetFrameTree()->root(); | 358 GetFrameTree()->root(); |
| 357 | 359 |
| 358 SitePerProcessWebContentsObserver observer(shell()->web_contents()); | 360 SitePerProcessWebContentsObserver observer(shell()->web_contents()); |
| 359 | 361 |
| (...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1102 params.frame_tree_node_id = child->frame_tree_node_id(); | 1104 params.frame_tree_node_id = child->frame_tree_node_id(); |
| 1103 child->navigator()->GetController()->LoadURLWithParams(params); | 1105 child->navigator()->GetController()->LoadURLWithParams(params); |
| 1104 nav_observer.Wait(); | 1106 nav_observer.Wait(); |
| 1105 | 1107 |
| 1106 // Verify that the navigation succeeded and the expected URL was loaded. | 1108 // Verify that the navigation succeeded and the expected URL was loaded. |
| 1107 EXPECT_TRUE(observer.navigation_succeeded()); | 1109 EXPECT_TRUE(observer.navigation_succeeded()); |
| 1108 EXPECT_EQ(url, observer.navigation_url()); | 1110 EXPECT_EQ(url, observer.navigation_url()); |
| 1109 } | 1111 } |
| 1110 | 1112 |
| 1111 } // namespace content | 1113 } // namespace content |
| OLD | NEW |