Index: content/browser/frame_host/navigator_impl_unittest.cc |
diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc |
index efb85766a817bd414a0de3a5063f90886c805664..880e971e2cfb5e19eae674c31c9dc1d01170ee4a 100644 |
--- a/content/browser/frame_host/navigator_impl_unittest.cc |
+++ b/content/browser/frame_host/navigator_impl_unittest.cc |
@@ -237,13 +237,22 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
EXPECT_FALSE(request->begin_params().has_user_gesture); |
EXPECT_EQ(kUrl2, request->common_params().url); |
EXPECT_FALSE(request->browser_initiated()); |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
// Have the current RenderFrameHost commit the navigation. |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(request) |
->CallOnResponseStarted(response, MakeEmptyStream()); |
- EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE( |
+ DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node))); |
+ } else { |
+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ } |
EXPECT_TRUE(main_test_rfh()->is_loading()); |
EXPECT_FALSE(node->navigation_request()); |
@@ -622,14 +631,24 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
// Confirm that the first loader got destroyed. |
EXPECT_FALSE(loader1); |
- // Confirm that the speculative RenderFrameHost was destroyed. |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ // Confirm that the speculative RenderFrameHost was destroyed in the non |
+ // SitePerProcess case. |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
// Have the RenderFrameHost commit the navigation. |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(request2) |
->CallOnResponseStarted(response, MakeEmptyStream()); |
- EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE( |
+ DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node))); |
+ } else { |
+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ } |
// Commit the navigation. |
main_test_rfh()->SendNavigate(1, 0, true, kUrl2); |
@@ -660,7 +679,11 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
EXPECT_EQ(kUrl1, request1->common_params().url); |
EXPECT_FALSE(request1->browser_initiated()); |
EXPECT_TRUE(request1->begin_params().has_user_gesture); |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
// Now receive a renderer-initiated non-user-initiated request. Nothing should |
// change. |
@@ -671,13 +694,22 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
EXPECT_EQ(kUrl1, request2->common_params().url); |
EXPECT_FALSE(request2->browser_initiated()); |
EXPECT_TRUE(request2->begin_params().has_user_gesture); |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
// Have the RenderFrameHost commit the navigation. |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(request2) |
->CallOnResponseStarted(response, MakeEmptyStream()); |
- EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE( |
+ DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node))); |
+ } else { |
+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ } |
// Commit the navigation. |
main_test_rfh()->SendNavigate(1, 0, true, kUrl1); |
@@ -753,7 +785,11 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
EXPECT_EQ(kUrl1, request1->common_params().url); |
EXPECT_FALSE(request1->browser_initiated()); |
EXPECT_FALSE(request1->begin_params().has_user_gesture); |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
base::WeakPtr<TestNavigationURLLoader> loader1 = |
GetLoaderForNavigationRequest(request1)->AsWeakPtr(); |
EXPECT_TRUE(loader1); |
@@ -764,7 +800,11 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
EXPECT_EQ(kUrl2, request2->common_params().url); |
EXPECT_FALSE(request2->browser_initiated()); |
EXPECT_FALSE(request2->begin_params().has_user_gesture); |
- EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
+ } else { |
+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
+ } |
// Confirm that the first loader got destroyed. |
EXPECT_FALSE(loader1); |
@@ -773,7 +813,12 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, |
scoped_refptr<ResourceResponse> response(new ResourceResponse); |
GetLoaderForNavigationRequest(request2) |
->CallOnResponseStarted(response, MakeEmptyStream()); |
- EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) { |
+ EXPECT_TRUE( |
+ DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node))); |
+ } else { |
+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh())); |
+ } |
// Commit the navigation. |
main_test_rfh()->SendNavigate(1, 0, true, kUrl2); |