| 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 "content/browser/frame_host/cross_process_frame_connector.h" | 9 #include "content/browser/frame_host/cross_process_frame_connector.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 // DidFailProvisionalLoad when navigating to client_redirect_http_url. | 647 // DidFailProvisionalLoad when navigating to client_redirect_http_url. |
| 648 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); | 648 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); |
| 649 EXPECT_FALSE(observer.navigation_succeeded()); | 649 EXPECT_FALSE(observer.navigation_succeeded()); |
| 650 } | 650 } |
| 651 } | 651 } |
| 652 | 652 |
| 653 // Ensure that when navigating a frame cross-process RenderFrameProxyHosts are | 653 // Ensure that when navigating a frame cross-process RenderFrameProxyHosts are |
| 654 // created in the FrameTree skipping the subtree of the navigating frame. | 654 // created in the FrameTree skipping the subtree of the navigating frame. |
| 655 // TODO(nasko): Test is disabled on Android, because it times out. It should | 655 // TODO(nasko): Test is disabled on Android, because it times out. It should |
| 656 // be fixed together with CrossSiteIframe on that platform. | 656 // be fixed together with CrossSiteIframe on that platform. |
| 657 #if defined(OS_ANDROID) | 657 // |
| 658 // Disabled on Mac due to flakiness on ASAN. http://crbug.com/425248 |
| 659 #if defined(OS_ANDROID) || defined(OS_MACOSX) |
| 658 #define MAYBE_ProxyCreationSkipsSubtree DISABLED_ProxyCreationSkipsSubtree | 660 #define MAYBE_ProxyCreationSkipsSubtree DISABLED_ProxyCreationSkipsSubtree |
| 659 #else | 661 #else |
| 660 #define MAYBE_ProxyCreationSkipsSubtree ProxyCreationSkipsSubtree | 662 #define MAYBE_ProxyCreationSkipsSubtree ProxyCreationSkipsSubtree |
| 661 #endif | 663 #endif |
| 662 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, | 664 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, |
| 663 MAYBE_ProxyCreationSkipsSubtree) { | 665 MAYBE_ProxyCreationSkipsSubtree) { |
| 664 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); | 666 GURL main_url(embedded_test_server()->GetURL("/site_per_process_main.html")); |
| 665 NavigateToURL(shell(), main_url); | 667 NavigateToURL(shell(), main_url); |
| 666 | 668 |
| 667 // It is safe to obtain the root frame tree node here, as it doesn't change. | 669 // It is safe to obtain the root frame tree node here, as it doesn't change. |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 } | 765 } |
| 764 | 766 |
| 765 navigation_observer.Wait(); | 767 navigation_observer.Wait(); |
| 766 EXPECT_EQ(cross_site_url, observer.navigation_url()); | 768 EXPECT_EQ(cross_site_url, observer.navigation_url()); |
| 767 EXPECT_TRUE(observer.navigation_succeeded()); | 769 EXPECT_TRUE(observer.navigation_succeeded()); |
| 768 EXPECT_EQ(0U, child->child_count()); | 770 EXPECT_EQ(0U, child->child_count()); |
| 769 } | 771 } |
| 770 } | 772 } |
| 771 | 773 |
| 772 } // namespace content | 774 } // namespace content |
| OLD | NEW |