Chromium Code Reviews| 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 2258b258559dae276adc48b300c29e3e03836a22..14dffa799c6df90fdcdef27e59d2ea95b4437b91 100644 |
| --- a/content/browser/frame_host/navigator_impl_unittest.cc |
| +++ b/content/browser/frame_host/navigator_impl_unittest.cc |
| @@ -2,6 +2,7 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| +#include "base/command_line.h" |
| #include "base/macros.h" |
| #include "base/time/time.h" |
| #include "content/browser/frame_host/navigation_controller_impl.h" |
| @@ -15,8 +16,10 @@ |
| #include "content/browser/streams/stream.h" |
| #include "content/common/navigation_params.h" |
| #include "content/public/browser/stream_handle.h" |
| +#include "content/public/common/content_switches.h" |
| #include "content/public/common/url_constants.h" |
| #include "content/public/common/url_utils.h" |
| +#include "content/public/test/mock_render_process_host.h" |
| #include "content/test/browser_side_navigation_test_utils.h" |
| #include "content/test/test_navigation_url_loader.h" |
| #include "content/test/test_render_frame_host.h" |
| @@ -73,8 +76,45 @@ class NavigatorTestWithBrowserSideNavigation |
| return static_cast<NavigatorImpl*>(frame_tree_node->navigator()) |
| ->GetNavigationRequestForNodeForTesting(frame_tree_node); |
| } |
| + |
| + TestRenderFrameHost* GetSpeculativeRenderFrameHost(FrameTreeNode* node) { |
| + return static_cast<TestRenderFrameHost*>( |
| + node->render_manager()->speculative_render_frame_host_.get()); |
| + } |
| + |
| + // Checks if this RenderFrameHost sent a single FrameMsg_CommitNavigation |
| + // since the last clearing of the sink. |
| + // Note: user must call ClearMessages on the sink before the commit happens. |
| + bool DidRenderFrameHostCommit(RenderFrameHostImpl* rfh) { |
| + MockRenderProcessHost* rph = |
| + static_cast<MockRenderProcessHost*>(rfh->GetProcess()); |
| + const FrameMsg_CommitNavigation* commitMessage = |
| + static_cast<const FrameMsg_CommitNavigation*>( |
| + rph->sink().GetUniqueMessageMatching( |
| + FrameMsg_CommitNavigation::ID)); |
| + return commitMessage && rfh->GetRoutingID() == commitMessage->routing_id(); |
| + } |
| }; |
| +// PlzNavigate: Test final state after a complete navigation (to avoid repeating |
| +// these checks in other tests). |
| +TEST_F(NavigatorTestWithBrowserSideNavigation, NavigationFinishedState) { |
| + const GURL kUrl("http://chromium.org/"); |
| + contents()->NavigateAndCommit(kUrl); |
| + ASSERT_TRUE(main_test_rfh()); |
| + EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state()); |
| + EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), |
| + main_test_rfh()->GetSiteInstance()->GetSiteURL()); |
| + |
| + // After a navigation is finished no speculative RenderFrameHost should |
| + // exist. |
| + FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| + |
| + // With PlzNavigate enabled a pending RenderFrameHost should never exist. |
| + EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| +} |
| + |
| // PlzNavigate: Test that a proper NavigationRequest is created by |
| // BeginNavigation. |
| // Note that all PlzNavigate methods on the browser side require the use of the |
| @@ -87,15 +127,15 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) { |
| contents()->NavigateAndCommit(kUrl1); |
| // Add a subframe. |
| - FrameTreeNode* root = contents()->GetFrameTree()->root(); |
| - TestRenderFrameHost* subframe_rfh = static_cast<TestRenderFrameHost*>( |
| - contents()->GetFrameTree()->AddFrame( |
| - root, root->current_frame_host()->GetProcess()->GetID(), 14, |
| + FrameTreeNode* root_node = contents()->GetFrameTree()->root(); |
| + TestRenderFrameHost* subframe_rfh = |
| + static_cast<TestRenderFrameHost*>(contents()->GetFrameTree()->AddFrame( |
| + root_node, root_node->current_frame_host()->GetProcess()->GetID(), 14, |
| "Child")); |
| - EXPECT_TRUE(subframe_rfh); |
| + ASSERT_TRUE(subframe_rfh); |
| FrameTreeNode* subframe_node = subframe_rfh->frame_tree_node(); |
| - SendRequestNavigation(subframe_rfh->frame_tree_node(), kUrl2); |
| + SendRequestNavigation(subframe_node, kUrl2); |
| // There is no previous renderer in the subframe, so BeginNavigation is |
| // handled already. |
| NavigationRequest* subframe_request = |
| @@ -109,11 +149,23 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) { |
| EXPECT_EQ(kUrl1, subframe_loader->request_info()->first_party_for_cookies); |
| EXPECT_FALSE(subframe_loader->request_info()->is_main_frame); |
| EXPECT_TRUE(subframe_loader->request_info()->parent_is_main_frame); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(root_node)); |
| + |
| + // Subframe navigations should never create a speculative RenderFrameHost, |
| + // unless site-per-process is enabled. In that case as the subframe navigation |
| + // is to a different site and is still ongoing, it should have one. |
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kSitePerProcess)) { |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_node)); |
| + } else { |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_node)); |
| + } |
| - SendRequestNavigation(root, kUrl3); |
| + SendRequestNavigation(root_node, kUrl3); |
| // Simulate a BeginNavigation IPC on the main frame. |
| - contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl3); |
| - NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(root); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl3); |
| + NavigationRequest* main_request = |
| + GetNavigationRequestForFrameTreeNode(root_node); |
| TestNavigationURLLoader* main_loader = |
| GetLoaderForNavigationRequest(main_request); |
| ASSERT_TRUE(main_request); |
| @@ -122,6 +174,18 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) { |
| EXPECT_EQ(kUrl3, main_loader->request_info()->first_party_for_cookies); |
| EXPECT_TRUE(main_loader->request_info()->is_main_frame); |
| EXPECT_FALSE(main_loader->request_info()->parent_is_main_frame); |
| + |
| + // Main frame navigation to a different site should use a speculative |
| + // RenderFrameHost. |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(root_node)); |
| + |
| + // The above situation regarding subframe navigations is valid here. |
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kSitePerProcess)) { |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_node)); |
| + } else { |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_node)); |
| + } |
| } |
| // PlzNavigate: Test that RequestNavigation creates a NavigationRequest and that |
| @@ -130,12 +194,17 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoLiveRenderer) { |
| const GURL kUrl("http://www.google.com/"); |
| EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive()); |
| - FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| + RenderFrameHostImpl* rfh = main_test_rfh(); |
| + FrameTreeNode* node = rfh->frame_tree_node(); |
| SendRequestNavigation(node, kUrl); |
| - NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| + |
| // A NavigationRequest should have been generated. |
| + NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| EXPECT_TRUE(main_request != NULL); |
| - RenderFrameHostImpl* rfh = main_test_rfh(); |
| + |
| + // As we're re-using the current RenderFrameHost, no speculative one should be |
| + // created. |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| // Now return the response without any redirects. This will cause the |
| // navigation to commit at the same URL. |
| @@ -151,24 +220,28 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoLiveRenderer) { |
| EXPECT_TRUE(main_test_rfh()->render_view_host()->IsRenderViewLive()); |
| } |
| -// PlzNavigate: Test that commiting an HTTP 204 or HTTP 205 response cancels the |
| -// navigation. |
| +// PlzNavigate: Test that committing an HTTP 204 or HTTP 205 response cancels |
| +// the navigation. |
| TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) { |
| const GURL kUrl1("http://www.chromium.org/"); |
| const GURL kUrl2("http://www.google.com/"); |
| // Load a URL. |
| contents()->NavigateAndCommit(kUrl1); |
| - RenderFrameHostImpl* rfh = main_test_rfh(); |
| - EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); |
| FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| // Navigate to a different site. |
| - SendRequestNavigation(node, kUrl2); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl2, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| + |
| NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request); |
| + // Navigations to a different site do create a speculative RenderFrameHost. |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
| + |
| // Commit an HTTP 204 response. |
| scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| const char kNoContentHeaders[] = "HTTP/1.1 204 No Content\0\0"; |
| @@ -177,17 +250,24 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) { |
| GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| response, MakeEmptyStream()); |
| - // There should be no pending RenderFrameHost; the navigation was aborted. |
| + // There should be no pending nor speculative RenderFrameHost; the navigation |
| + // was aborted. |
| + EXPECT_FALSE(DidRenderFrameHostCommit(main_test_rfh())); |
| EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); |
| EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| // Now, repeat the test with 205 Reset Content. |
| // Navigate to a different site again. |
| - SendRequestNavigation(node, kUrl2); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl2, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| + |
| main_request = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request); |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
| // Commit an HTTP 205 response. |
| response = new ResourceResponse; |
| @@ -197,9 +277,12 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) { |
| GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| response, MakeEmptyStream()); |
| - // There should be no pending RenderFrameHost; the navigation was aborted. |
| + // There should be no pending nor speculative RenderFrameHost; the navigation |
| + // was aborted. |
| + EXPECT_FALSE(DidRenderFrameHostCommit(main_test_rfh())); |
| EXPECT_FALSE(GetNavigationRequestForFrameTreeNode(node)); |
| EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| } |
| // PlzNavigate: Test that a new RenderFrameHost is created when doing a cross |
| @@ -209,42 +292,54 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) { |
| const GURL kUrl2("http://www.google.com/"); |
| contents()->NavigateAndCommit(kUrl1); |
| - RenderFrameHostImpl* rfh = main_test_rfh(); |
| - EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); |
| + RenderFrameHostImpl* initial_rfh = main_test_rfh(); |
| FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| // Navigate to a different site. |
| - SendRequestNavigation(node, kUrl2); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl2, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request); |
| + EXPECT_TRUE(GetSpeculativeRenderFrameHost(node)); |
| scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| response, MakeEmptyStream()); |
| - RenderFrameHostImpl* pending_rfh = |
| - node->render_manager()->pending_frame_host(); |
| - ASSERT_TRUE(pending_rfh); |
| - EXPECT_NE(pending_rfh, rfh); |
| - EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); |
| - EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); |
| + TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + ASSERT_TRUE(speculative_rfh); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(speculative_rfh)); |
| + EXPECT_FALSE(DidRenderFrameHostCommit(main_test_rfh())); |
| + |
| + speculative_rfh->SendNavigate(0, kUrl2); |
| + |
| + RenderFrameHostImpl* final_rfh = main_test_rfh(); |
| + ASSERT_TRUE(final_rfh); |
| + EXPECT_NE(initial_rfh, final_rfh); |
| + EXPECT_TRUE(final_rfh->IsRenderFrameLive()); |
| + EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| } |
| -// PlzNavigate: Test that redirects are followed. |
| +// PlzNavigate: Test that redirects are followed and the speculative renderer |
| +// logic behaves as expected. |
| TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
| const GURL kUrl1("http://www.chromium.org/"); |
| const GURL kUrl2("http://www.google.com/"); |
| contents()->NavigateAndCommit(kUrl1); |
| RenderFrameHostImpl* rfh = main_test_rfh(); |
| - EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state()); |
| FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| // Navigate to a URL on the same site. |
| - SendRequestNavigation(node, kUrl1); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl1, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
| NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| // It then redirects to another site. |
| net::RedirectInfo redirect_info; |
| @@ -252,41 +347,52 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) { |
| redirect_info.new_method = "GET"; |
| redirect_info.new_url = kUrl2; |
| redirect_info.new_first_party_for_cookies = kUrl2; |
| - scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| + scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| GetLoaderForNavigationRequest(main_request)->CallOnRequestRedirected( |
| redirect_info, response); |
| // The redirect should have been followed. |
| EXPECT_EQ(1, GetLoaderForNavigationRequest(main_request)->redirect_count()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| // Then it commits. |
| response = new ResourceResponse; |
| GetLoaderForNavigationRequest(main_request)->CallOnResponseStarted( |
| response, MakeEmptyStream()); |
| - RenderFrameHostImpl* pending_rfh = |
| - node->render_manager()->pending_frame_host(); |
| - ASSERT_TRUE(pending_rfh); |
| - EXPECT_NE(pending_rfh, rfh); |
| - EXPECT_TRUE(pending_rfh->IsRenderFrameLive()); |
| - EXPECT_TRUE(pending_rfh->render_view_host()->IsRenderViewLive()); |
| + TestRenderFrameHost* last_speculative_rfh = |
| + GetSpeculativeRenderFrameHost(node); |
| + EXPECT_TRUE(last_speculative_rfh); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(last_speculative_rfh)); |
| + |
| + // And commits provisional load. |
| + last_speculative_rfh->SendNavigate(0, kUrl2); |
| + RenderFrameHostImpl* final_rfh = main_test_rfh(); |
| + ASSERT_TRUE(final_rfh); |
| + EXPECT_NE(rfh, final_rfh); |
| + EXPECT_EQ(last_speculative_rfh, final_rfh); |
| + EXPECT_TRUE(final_rfh->IsRenderFrameLive()); |
| + EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| } |
| -// PlzNavigate: Test that a navigation is cancelled if another request has been |
| -// issued in the meantime. |
| +// PlzNavigate: Test that a navigation is canceled if another request has been |
| +// issued in the meantime. Also confirms that the speculative renderer is |
| +// correctly updated in the process. |
| TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
| const GURL kUrl0("http://www.wikipedia.org/"); |
| - const GURL kUrl0_site = SiteInstance::GetSiteForURL(browser_context(), kUrl0); |
| const GURL kUrl1("http://www.chromium.org/"); |
| + const GURL kUrl1_site = SiteInstance::GetSiteForURL(browser_context(), kUrl1); |
| const GURL kUrl2("http://www.google.com/"); |
| const GURL kUrl2_site = SiteInstance::GetSiteForURL(browser_context(), kUrl2); |
| // Initialization. |
| contents()->NavigateAndCommit(kUrl0); |
| FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| - EXPECT_EQ(kUrl0_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); |
| // Request navigation to the 1st URL. |
| - SendRequestNavigation(node, kUrl1); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl1, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
| NavigationRequest* request1 = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(request1); |
| @@ -294,9 +400,16 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
| base::WeakPtr<TestNavigationURLLoader> loader1 = |
| GetLoaderForNavigationRequest(request1)->AsWeakPtr(); |
| + // Confirm a speculative RFH was created. |
| + TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + ASSERT_TRUE(speculative_rfh); |
| + int32 site_instance_id_1 = speculative_rfh->GetSiteInstance()->GetId(); |
| + EXPECT_EQ(kUrl1_site, speculative_rfh->GetSiteInstance()->GetSiteURL()); |
| + |
| // Request navigation to the 2nd URL; the NavigationRequest must have been |
| // replaced by a new one with a different URL. |
| - SendRequestNavigation(node, kUrl2); |
| + contents()->GetController().LoadURL(kUrl2, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| main_test_rfh()->SendBeginNavigationWithURL(kUrl2); |
| NavigationRequest* request2 = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(request2); |
| @@ -305,18 +418,33 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) { |
| // Confirm that the first loader got destroyed. |
| EXPECT_FALSE(loader1); |
| - // Confirm that the commit corresponds to the new request. |
| + // Confirm that a new speculative RFH 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); |
| + |
| + // Commit. |
| scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| GetLoaderForNavigationRequest(request2)->CallOnResponseStarted( |
| response, MakeEmptyStream()); |
| - RenderFrameHostImpl* pending_rfh = |
| - node->render_manager()->pending_frame_host(); |
| - ASSERT_TRUE(pending_rfh); |
| - EXPECT_EQ(kUrl2_site, pending_rfh->GetSiteInstance()->GetSiteURL()); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(speculative_rfh)); |
| + EXPECT_FALSE(DidRenderFrameHostCommit(main_test_rfh())); |
| + |
| + // And commit provisional load. |
| + speculative_rfh->SendNavigate(0, kUrl2); |
| + |
| + // Confirm that the commit corresponds to the new request. |
| + ASSERT_TRUE(main_test_rfh()); |
| + EXPECT_EQ(kUrl2_site, main_test_rfh()->GetSiteInstance()->GetSiteURL()); |
| + |
| + // Confirm that the committed RFH is the new speculative one. |
| + EXPECT_EQ(site_instance_id_2, main_test_rfh()->GetSiteInstance()->GetId()); |
| } |
| // PlzNavigate: Test that a reload navigation is properly signaled to the |
| -// renderer when the navigation can commit. |
| +// renderer when the navigation can commit. Speculative renderers should not be |
| +// created at any step. |
| TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
| const GURL kUrl("http://www.google.com/"); |
| contents()->NavigateAndCommit(kUrl); |
| @@ -325,27 +453,191 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) { |
| SendRequestNavigationWithParameters( |
| node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, |
| NavigationController::RELOAD); |
| - contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl); |
| // A NavigationRequest should have been generated. |
| NavigationRequest* main_request = |
| GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request != NULL); |
| EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD, |
| main_request->common_params().navigation_type); |
| - int page_id = contents()->GetMaxPageIDForSiteInstance( |
| - main_test_rfh()->GetSiteInstance()) + 1; |
| - main_test_rfh()->SendNavigate(page_id, kUrl); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| + |
| + main_test_rfh()->SendNavigate(0, kUrl); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| // Now do a shift+reload. |
| SendRequestNavigationWithParameters( |
| node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK, |
| NavigationController::RELOAD_IGNORING_CACHE); |
| - contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl); |
| // A NavigationRequest should have been generated. |
| main_request = GetNavigationRequestForFrameTreeNode(node); |
| ASSERT_TRUE(main_request != NULL); |
| EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE, |
| main_request->common_params().navigation_type); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| +} |
| + |
| +// PlzNavigate: Confirm that a speculative RenderFrameHost is used when |
| +// navigating from one site to the another. |
| +TEST_F(NavigatorTestWithBrowserSideNavigation, |
| + SpeculativeRendererWorksBaseCase) { |
| + // Navigate to an initial site. |
| + const GURL kUrlInit("http://wikipedia.org/"); |
| + contents()->NavigateAndCommit(kUrlInit); |
| + FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| + |
| + // Begin navigating to another site. |
| + const GURL kUrl("http://google.com/"); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl); |
| + TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + ASSERT_TRUE(speculative_rfh); |
| + EXPECT_NE(speculative_rfh, main_test_rfh()); |
| + EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), |
| + speculative_rfh->GetSiteInstance()->GetSiteURL()); |
| + EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| + int32 site_instance_id = speculative_rfh->GetSiteInstance()->GetId(); |
| + |
| + // Ask Navigator to commit the navigation by simulating a call to |
| + // OnResponseStarted. |
| + scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| + GetLoaderForNavigationRequest(GetNavigationRequestForFrameTreeNode(node)) |
| + ->CallOnResponseStarted(response, MakeEmptyStream()); |
| + speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + ASSERT_TRUE(speculative_rfh); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(speculative_rfh)); |
| + EXPECT_EQ(site_instance_id, speculative_rfh->GetSiteInstance()->GetId()); |
| + EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| + |
| + // Invoke OnDidCommitProvisionalLoad. |
| + speculative_rfh->SendNavigate(0, kUrl); |
| + EXPECT_EQ(site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| + EXPECT_FALSE(node->render_manager()->pending_frame_host()); |
| +} |
| + |
| +// PlzNavigate: Confirm that a speculative RenderFrameHost is thrown away when |
| +// the final URL's site differs from the initial one due to redirects. |
| +TEST_F(NavigatorTestWithBrowserSideNavigation, |
| + SpeculativeRendererDiscardedAfterRedirectToAnotherSite) { |
| + // Navigate to an initial site. |
| + const GURL kUrlInit("http://wikipedia.org/"); |
| + contents()->NavigateAndCommit(kUrlInit); |
| + FrameTreeNode* node = main_test_rfh()->frame_tree_node(); |
| + int32 init_site_instance_id = main_test_rfh()->GetSiteInstance()->GetId(); |
| + |
| + // Begin navigating to another site. |
| + const GURL kUrl("http://google.com/"); |
| + process()->sink().ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl); |
| + TestRenderFrameHost* speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + int32 site_instance_id = speculative_rfh->GetSiteInstance()->GetId(); |
| + EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); |
| + ASSERT_TRUE(speculative_rfh); |
| + EXPECT_NE(speculative_rfh, main_test_rfh()); |
| + EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl), |
| + speculative_rfh->GetSiteInstance()->GetSiteURL()); |
| + |
| + // It then redirects to yet another site. |
| + NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node); |
| + ASSERT_TRUE(main_request); |
| + const GURL kUrlRedirect("https://www.google.com/"); |
| + net::RedirectInfo redirect_info; |
| + redirect_info.status_code = 302; |
| + redirect_info.new_method = "GET"; |
| + redirect_info.new_url = kUrlRedirect; |
| + redirect_info.new_first_party_for_cookies = kUrlRedirect; |
| + scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| + GetLoaderForNavigationRequest(main_request) |
| + ->CallOnRequestRedirected(redirect_info, response); |
| + EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); |
| + speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + ASSERT_TRUE(speculative_rfh); |
| + |
| + // TODO(carlosk): once the speculative RenderFrameHost updates with redirects |
| + // this next check will be changed to verify that it actually happens. |
| + EXPECT_EQ(site_instance_id, speculative_rfh->GetSiteInstance()->GetId()); |
| + |
| + // Commit the navigation with Navigator by simulating the call to |
| + // OnResponseStarted. |
| + response = new ResourceResponse; |
| + GetLoaderForNavigationRequest(main_request) |
| + ->CallOnResponseStarted(response, MakeEmptyStream()); |
| + speculative_rfh = GetSpeculativeRenderFrameHost(node); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(speculative_rfh)); |
| + EXPECT_EQ(init_site_instance_id, main_test_rfh()->GetSiteInstance()->GetId()); |
| + |
| + // Once commit happens the speculative RenderFrameHost is already updated to |
| + // match the known final SiteInstance. |
| + ASSERT_TRUE(speculative_rfh); |
| + EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrlRedirect), |
| + speculative_rfh->GetSiteInstance()->GetSiteURL()); |
| + int32 redirect_site_instance_id = speculative_rfh->GetSiteInstance()->GetId(); |
| + |
| + // Invoke OnDidCommitProvisionalLoad. |
| + speculative_rfh->SendNavigate(0, kUrlRedirect); |
| + |
| + // Checks that the speculative RenderFrameHost was swapped in. |
| + EXPECT_EQ(redirect_site_instance_id, |
| + main_test_rfh()->GetSiteInstance()->GetId()); |
| + EXPECT_FALSE(GetSpeculativeRenderFrameHost(node)); |
| +} |
| + |
| +// PlzNavigate: Verify that a previously swapped out RenderFrameHost is |
| +// correctly reused when spawning a speculative RenderFrameHost in a navigation |
| +// using the same SiteInstance. |
| +TEST_F(NavigatorTestWithBrowserSideNavigation, |
| + SpeculativeRendererReuseSwappedOutRFH) { |
| + // Navigate to an initial site. |
| + const GURL kUrl1("http://wikipedia.org/"); |
| + contents()->NavigateAndCommit(kUrl1); |
| + RenderFrameHostImpl* rfh1 = main_test_rfh(); |
| + FrameTreeNode* node = rfh1->frame_tree_node(); |
| + RenderFrameHostManager* rfhm = node->render_manager(); |
| + |
| + // Increment active frame count to cause the RenderFrameHost to be swapped out |
| + // (instead of immediately destroyed). |
| + rfh1->GetSiteInstance()->increment_active_frame_count(); |
| + |
| + // Navigate to another site to swap-out the initial RenderFrameHost. |
| + const GURL kUrl2("http://chromium.org/"); |
| + contents()->NavigateAndCommit(kUrl2); |
| + ASSERT_NE(rfh1, main_test_rfh()); |
| + EXPECT_NE(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state()); |
| + EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, main_test_rfh()->rfh_state()); |
| + EXPECT_TRUE(rfhm->IsOnSwappedOutList(rfh1)); |
| + |
| + // Now go back to the initial site so that the swapped-out RenderFrameHost |
| + // should be reused. |
|
clamy
2014/12/31 14:07:09
nit: s/swapped-out/swapped out
carlosk
2014/12/31 15:39:51
Done.
|
| + process()->sink().ClearMessages(); |
| + static_cast<MockRenderProcessHost*>(rfh1->GetProcess()) |
| + ->sink() |
| + .ClearMessages(); |
| + contents()->GetController().LoadURL(kUrl1, Referrer(), |
| + ui::PAGE_TRANSITION_LINK, std::string()); |
| + main_test_rfh()->SendBeginNavigationWithURL(kUrl1); |
| + EXPECT_EQ(rfh1, GetSpeculativeRenderFrameHost(node)); |
| + EXPECT_NE(RenderFrameHostImpl::STATE_DEFAULT, |
| + GetSpeculativeRenderFrameHost(node)->rfh_state()); |
| + |
| + scoped_refptr<ResourceResponse> response(new ResourceResponse); |
| + GetLoaderForNavigationRequest(GetNavigationRequestForFrameTreeNode(node)) |
| + ->CallOnResponseStarted(response, MakeEmptyStream()); |
| + EXPECT_EQ(rfh1, GetSpeculativeRenderFrameHost(node)); |
| + EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, |
| + GetSpeculativeRenderFrameHost(node)->rfh_state()); |
| + EXPECT_TRUE(DidRenderFrameHostCommit(rfh1)); |
| + EXPECT_FALSE(DidRenderFrameHostCommit(main_test_rfh())); |
| + |
| + contents()->CommitPendingNavigation(); |
| + EXPECT_EQ(rfh1, main_test_rfh()); |
| + EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh1->rfh_state()); |
| + EXPECT_FALSE(rfhm->IsOnSwappedOutList(rfh1)); |
| } |
| } // namespace content |