content/browser/frame_host/navigator_impl_unittest.cc - Issue 946543003: PlzNavigate: have renderer-initiated navigations be same-process

Unified Diff: content/browser/frame_host/navigator_impl_unittest.cc

Issue 946543003: PlzNavigate: have renderer-initiated navigations be same-process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Integrating changes from other refactors and fully fixing affected tests. Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/navigator_impl.cc ('K') | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d7e41e5856023ca3d42de60dac4c68754f8c151d..1f893a73028fbc54c246a1a6dc8550a728d4d163 100644

--- a/content/browser/frame_host/navigator_impl_unittest.cc

+++ b/content/browser/frame_host/navigator_impl_unittest.cc

@@ -543,9 +543,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

EXPECT_TRUE(loader1);

// Confirm a speculative RenderFrameHost was created.

clamy 2015/03/05 10:44:05 nit: "Confirm that"

carlosk 2015/03/06 11:55:03 Done.

- TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node);

- ASSERT_TRUE(speculative_rfh);

- int32 site_instance_id_1 = speculative_rfh->GetSiteInstance()->GetId();

+ ASSERT_TRUE(GetSpeculativeRenderFrameHost(node));

// Now receive a renderer-initiated user-initiated request. It should replace

// the current NavigationRequest.

@@ -559,28 +557,21 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// Confirm that the first loader got destroyed.

EXPECT_FALSE(loader1);

- // Confirm that a new speculative RenderFrameHost was created.

- speculative_rfh = GetSpeculativeRenderFrameHost(node);

- ASSERT_TRUE(speculative_rfh);

- int32 site_instance_id_2 = speculative_rfh->GetSiteInstance()->GetId();

- EXPECT_NE(site_instance_id_1, site_instance_id_2);

+ // Confirm that a the speculative RenderFrameHost was destroyed.

clamy 2015/03/05 10:44:05 Remove the "a" from the comment.

carlosk 2015/03/06 11:55:03 Done.

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

// Have the RenderFrameHost commit the navigation.

scoped_refptr<ResourceResponse> response(new ResourceResponse);

GetLoaderForNavigationRequest(request2)

->CallOnResponseStarted(response, MakeEmptyStream());

- EXPECT_TRUE(DidRenderFrameHostRequestCommit(speculative_rfh));

- EXPECT_FALSE(DidRenderFrameHostRequestCommit(main_test_rfh()));

+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh()));

// Commit the navigation.

- speculative_rfh->SendNavigate(0, kUrl2);

+ main_test_rfh()->SendNavigate(0, kUrl2);

// Confirm that the commit corresponds to the new request.

ASSERT_TRUE(main_test_rfh());

EXPECT_EQ(kUrl2, contents()->GetLastCommittedURL());

- // Confirm that the committed RenderFrameHost is the latest speculative one.

- EXPECT_EQ(site_instance_id_2, main_test_rfh()->GetSiteInstance()->GetId());

}

// PlzNavigate: Test that a renderer-initiated user-initiated navigation is NOT

@@ -604,7 +595,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

EXPECT_EQ(kUrl1, request1->common_params().url);

EXPECT_FALSE(request1->browser_initiated());

EXPECT_TRUE(request1->begin_params().has_user_gesture);

- EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

// Now receive a renderer-initiated non-user-initiated request. Nothing should

// change.

@@ -615,18 +606,16 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

EXPECT_EQ(kUrl1, request2->common_params().url);

EXPECT_FALSE(request2->browser_initiated());

EXPECT_TRUE(request2->begin_params().has_user_gesture);

- TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node);

- ASSERT_TRUE(speculative_rfh);

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

// Have the RenderFrameHost commit the navigation.

scoped_refptr<ResourceResponse> response(new ResourceResponse);

GetLoaderForNavigationRequest(request2)

->CallOnResponseStarted(response, MakeEmptyStream());

- EXPECT_TRUE(DidRenderFrameHostRequestCommit(speculative_rfh));

- EXPECT_FALSE(DidRenderFrameHostRequestCommit(main_test_rfh()));

+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh()));

// Commit the navigation.

- speculative_rfh->SendNavigate(0, kUrl1);

+ main_test_rfh()->SendNavigate(0, kUrl1);

EXPECT_EQ(kUrl1, contents()->GetLastCommittedURL());

}

@@ -698,7 +687,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

EXPECT_EQ(kUrl1, request1->common_params().url);

EXPECT_FALSE(request1->browser_initiated());

EXPECT_FALSE(request1->begin_params().has_user_gesture);

- EXPECT_TRUE(GetSpeculativeRenderFrameHost(node));

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

base::WeakPtr<TestNavigationURLLoader> loader1 =

GetLoaderForNavigationRequest(request1)->AsWeakPtr();

EXPECT_TRUE(loader1);

@@ -709,8 +698,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

EXPECT_EQ(kUrl2, request2->common_params().url);

EXPECT_FALSE(request2->browser_initiated());

EXPECT_FALSE(request2->begin_params().has_user_gesture);

- TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node);

- ASSERT_TRUE(speculative_rfh);

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

// Confirm that the first loader got destroyed.

EXPECT_FALSE(loader1);

@@ -719,11 +707,10 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

scoped_refptr<ResourceResponse> response(new ResourceResponse);

GetLoaderForNavigationRequest(request2)

->CallOnResponseStarted(response, MakeEmptyStream());

- EXPECT_TRUE(DidRenderFrameHostRequestCommit(speculative_rfh));

- EXPECT_FALSE(DidRenderFrameHostRequestCommit(main_test_rfh()));

+ EXPECT_TRUE(DidRenderFrameHostRequestCommit(main_test_rfh()));

// Commit the navigation.

- speculative_rfh->SendNavigate(0, kUrl2);

+ main_test_rfh()->SendNavigate(0, kUrl2);

EXPECT_EQ(kUrl2, contents()->GetLastCommittedURL());

}

@@ -968,10 +955,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, DataUrls) {

EXPECT_EQ(NavigationRequest::RESPONSE_STARTED,

navigation_request->state());

EXPECT_FALSE(navigation_request->loader_for_testing());

- speculative_rfh = GetSpeculativeRenderFrameHost(node);

- ASSERT_TRUE(speculative_rfh);

- speculative_rfh->SendNavigate(0, kUrl2);

- EXPECT_EQ(main_test_rfh(), speculative_rfh);

+ EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));

carlosk 2015/03/04 19:42:41 I removed the call to SendNavigate because in the

clamy 2015/03/05 10:44:04 Acknowledged.

}

} // namespace content