| 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 81dda4549471434e14c63470d9743f503e6e20ca..41e14e775ffd63d641a036e32533a52bbf52bce8 100644
|
| --- a/content/browser/frame_host/navigator_impl_unittest.cc
|
| +++ b/content/browser/frame_host/navigator_impl_unittest.cc
|
| @@ -232,7 +232,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| EXPECT_FALSE(request->begin_params().has_user_gesture);
|
| EXPECT_EQ(kUrl2, request->common_params().url);
|
| EXPECT_FALSE(request->browser_initiated());
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -242,7 +242,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| scoped_refptr<ResourceResponse> response(new ResourceResponse);
|
| GetLoaderForNavigationRequest(request)->CallOnResponseStarted(
|
| response, MakeEmptyStream(), nullptr);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(
|
| DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node)));
|
| } else {
|
| @@ -631,7 +631,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
|
|
| // Confirm that the speculative RenderFrameHost was destroyed in the non
|
| // SitePerProcess case.
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -641,7 +641,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| scoped_refptr<ResourceResponse> response(new ResourceResponse);
|
| GetLoaderForNavigationRequest(request2)->CallOnResponseStarted(
|
| response, MakeEmptyStream(), nullptr);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(
|
| DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node)));
|
| } else {
|
| @@ -677,7 +677,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| EXPECT_EQ(kUrl1, request1->common_params().url);
|
| EXPECT_FALSE(request1->browser_initiated());
|
| EXPECT_TRUE(request1->begin_params().has_user_gesture);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -692,7 +692,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| EXPECT_EQ(kUrl1, request2->common_params().url);
|
| EXPECT_FALSE(request2->browser_initiated());
|
| EXPECT_TRUE(request2->begin_params().has_user_gesture);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -702,7 +702,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| scoped_refptr<ResourceResponse> response(new ResourceResponse);
|
| GetLoaderForNavigationRequest(request2)->CallOnResponseStarted(
|
| response, MakeEmptyStream(), nullptr);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(
|
| DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node)));
|
| } else {
|
| @@ -783,7 +783,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| EXPECT_EQ(kUrl1, request1->common_params().url);
|
| EXPECT_FALSE(request1->browser_initiated());
|
| EXPECT_FALSE(request1->begin_params().has_user_gesture);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -798,7 +798,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| EXPECT_EQ(kUrl2, request2->common_params().url);
|
| EXPECT_FALSE(request2->browser_initiated());
|
| EXPECT_FALSE(request2->begin_params().has_user_gesture);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));
|
| } else {
|
| EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
|
| @@ -811,7 +811,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,
|
| scoped_refptr<ResourceResponse> response(new ResourceResponse);
|
| GetLoaderForNavigationRequest(request2)->CallOnResponseStarted(
|
| response, MakeEmptyStream(), nullptr);
|
| - if (SiteIsolationPolicy::AreCrossProcessFramesPossible()) {
|
| + if (AreAllSitesIsolatedForTesting()) {
|
| EXPECT_TRUE(
|
| DidRenderFrameHostRequestCommit(GetSpeculativeRenderFrameHost(node)));
|
| } else {
|
|
|