| 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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 // DidFailProvisionalLoad when navigating to client_redirect_http_url. | 772 // DidFailProvisionalLoad when navigating to client_redirect_http_url. |
| 773 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); | 773 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); |
| 774 EXPECT_FALSE(observer.navigation_succeeded()); | 774 EXPECT_FALSE(observer.navigation_succeeded()); |
| 775 } | 775 } |
| 776 } | 776 } |
| 777 | 777 |
| 778 // Ensure that when navigating a frame cross-process RenderFrameProxyHosts are | 778 // Ensure that when navigating a frame cross-process RenderFrameProxyHosts are |
| 779 // created in the FrameTree skipping the subtree of the navigating frame. | 779 // created in the FrameTree skipping the subtree of the navigating frame. |
| 780 // | 780 // |
| 781 // Disabled on Mac due to flakiness on ASAN. http://crbug.com/425248 | 781 // Disabled on Mac due to flakiness on ASAN. http://crbug.com/425248 |
| 782 #if defined(OS_MACOSX) | 782 // Disabled on Windows due to flakiness on Win 7 bot. http://crbug.com/444563 |
| 783 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 783 #define MAYBE_ProxyCreationSkipsSubtree DISABLED_ProxyCreationSkipsSubtree | 784 #define MAYBE_ProxyCreationSkipsSubtree DISABLED_ProxyCreationSkipsSubtree |
| 784 #else | 785 #else |
| 785 #define MAYBE_ProxyCreationSkipsSubtree ProxyCreationSkipsSubtree | 786 #define MAYBE_ProxyCreationSkipsSubtree ProxyCreationSkipsSubtree |
| 786 #endif | 787 #endif |
| 787 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, | 788 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| 788 MAYBE_ProxyCreationSkipsSubtree) { | 789 MAYBE_ProxyCreationSkipsSubtree) { |
| 789 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); | 790 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| 790 NavigateToURL(shell(), main_url); | 791 NavigateToURL(shell(), main_url); |
| 791 | 792 |
| 792 // It is safe to obtain the root frame tree node here, as it doesn't change. | 793 // It is safe to obtain the root frame tree node here, as it doesn't change. |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1100 params.frame_tree_node_id = child->frame_tree_node_id(); | 1101 params.frame_tree_node_id = child->frame_tree_node_id(); |
| 1101 child->navigator()->GetController()->LoadURLWithParams(params); | 1102 child->navigator()->GetController()->LoadURLWithParams(params); |
| 1102 nav_observer.Wait(); | 1103 nav_observer.Wait(); |
| 1103 | 1104 |
| 1104 // Verify that the navigation succeeded and the expected URL was loaded. | 1105 // Verify that the navigation succeeded and the expected URL was loaded. |
| 1105 EXPECT_TRUE(observer.navigation_succeeded()); | 1106 EXPECT_TRUE(observer.navigation_succeeded()); |
| 1106 EXPECT_EQ(url, observer.navigation_url()); | 1107 EXPECT_EQ(url, observer.navigation_url()); |
| 1107 } | 1108 } |
| 1108 | 1109 |
| 1109 } // namespace content | 1110 } // namespace content |
| OLD | NEW |