PlzNavigate: Speculatively spawns a renderer process for navigations.

content/browser/frame_host/navigator_impl_unittest.cc

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 96afc97d3479fbf69b0575ba16bdf879d1bfb3eb..5a86b397faf64f38636f932cb2ca389137f41bc6 100644
--- a/content/browser/frame_host/navigator_impl_unittest.cc
+++ b/content/browser/frame_host/navigator_impl_unittest.cc
@@ -79,6 +79,10 @@ class NavigatorTestWithBrowserSideNavigation
     return static_cast<NavigatorImpl*>(frame_tree_node->navigator())
         ->GetNavigationRequestForNodeForTesting(frame_tree_node);
   }
+
+  RenderFrameHost* GetSpeculativeRenderFrameHost(RenderFrameHostManager* rfhm) {
+    return rfhm->speculative_render_frame_host_.get();
+  }
 };
 
 // PlzNavigate: Test that a proper NavigationRequest is created by
@@ -91,9 +95,13 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) {
   const GURL kUrl3("http://www.gmail.com/");
 
   contents()->NavigateAndCommit(kUrl1);
+  FrameTreeNode* root = contents()->GetFrameTree()->root();
+  RenderFrameHostManager* root_rfhm = root->render_manager();

[clamy, 2014/12/09 15:09:52]

nit: Please add an empty line here.

[carlosk, 2014/12/16 01:53:47]

This part was moved to another test.

+  // After a navigation is committed no speculative RenderFrameHost should
+  // exist.
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(root_rfhm));
 
   // 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,
@@ -101,6 +109,8 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) {
   EXPECT_TRUE(subframe_rfh);
 
   FrameTreeNode* subframe_node = subframe_rfh->frame_tree_node();
+  RenderFrameHostManager* subframe_rfhm = subframe_node->render_manager();
+  EXPECT_NE(root_rfhm, subframe_rfhm);
   SendRequestNavigation(subframe_rfh->frame_tree_node(), kUrl2);
   // There is no previous renderer in the subframe, so BeginNavigation is
   // handled already.
@@ -115,6 +125,10 @@ 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);
+  // Subframe navigations should not create a speculative RenderFrameHost.

[clamy, 2014/12/09 15:09:52]

nit: Please add an empty line before this comment.

[carlosk, 2014/12/16 01:53:47]

Done.

+  // (unless site-per-process is enabled)

[Charlie Reis, 2014/12/10 22:37:45]

nit: Period goes after the the close paren, not after RenderFrameHost.

Can we find a way to make this pass with the --site-per-process flag?  Otherwise
our Site Isolation FYI bots will go red.

[carlosk, 2014/12/16 01:53:48]

Done.

+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(root_rfhm));
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_rfhm));
 
   SendRequestNavigation(root, kUrl3);
   // Simulate a BeginNavigation IPC on the main frame.
@@ -128,6 +142,10 @@ 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 navigations to different sites should use a speculative

[clamy, 2014/12/09 15:09:52]

nit: Please add an empty line before this comment.

[carlosk, 2014/12/16 01:53:48]

Done.

+  // RenderFrameHost.
+  EXPECT_TRUE(GetSpeculativeRenderFrameHost(root_rfhm));
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_rfhm));
 }
 
 // PlzNavigate: Test that RequestNavigation creates a NavigationRequest and that
@@ -137,10 +155,14 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoLiveRenderer) {
 
   EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive());
   FrameTreeNode* node = main_test_rfh()->frame_tree_node();
+  RenderFrameHostManager* rfhm = node->render_manager();
   SendRequestNavigation(node, kUrl);
   NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node);
   // A NavigationRequest should have been generated.
   EXPECT_TRUE(main_request != NULL);
+  // As we're re-using the current RenderFrameHost, no speculative one should be

[clamy, 2014/12/09 15:09:52]

nit: Please add an empty line before this comment.

[carlosk, 2014/12/16 01:53:48]

Done.

+  // created.
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
   RenderFrameHostImpl* rfh = main_test_rfh();
 
   // Now return the response without any redirects. This will cause the
@@ -157,8 +179,8 @@ 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/");
@@ -168,12 +190,15 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) {
   RenderFrameHostImpl* rfh = main_test_rfh();
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state());
   FrameTreeNode* node = main_test_rfh()->frame_tree_node();
+  RenderFrameHostManager* rfhm = node->render_manager();
 
   // Navigate to a different site.
   SendRequestNavigation(node, kUrl2);
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node);
   ASSERT_TRUE(main_request);
+  // Navigations to a different site do create a speculative RenderFrameHost.

[clamy, 2014/12/09 15:09:52]

nit: Please add an empty line before this comment.

[carlosk, 2014/12/16 01:53:48]

Done.

+  EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
 
   // Commit an HTTP 204 response.
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
@@ -183,9 +208,11 @@ 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(GetNavigationRequestForFrameTreeNode(node));
   EXPECT_FALSE(node->render_manager()->pending_frame_host());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 
   // Now, repeat the test with 205 Reset Content.
 
@@ -194,6 +221,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) {
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   main_request = GetNavigationRequestForFrameTreeNode(node);
   ASSERT_TRUE(main_request);
+  EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
 
   // Commit an HTTP 205 response.
   response = new ResourceResponse;
@@ -203,9 +231,11 @@ 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(GetNavigationRequestForFrameTreeNode(node));
   EXPECT_FALSE(node->render_manager()->pending_frame_host());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 }
 
 // PlzNavigate: Test that a new RenderFrameHost is created when doing a cross
@@ -218,25 +248,28 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, CrossSiteNavigation) {
   RenderFrameHostImpl* rfh = main_test_rfh();
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state());
   FrameTreeNode* node = main_test_rfh()->frame_tree_node();
+  RenderFrameHostManager* rfhm = node->render_manager();
 
   // Navigate to a different site.
   SendRequestNavigation(node, kUrl2);
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node);
   ASSERT_TRUE(main_request);
+  EXPECT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
 
   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());
+  RenderFrameHostImpl* final_rfh = main_test_rfh();
+  ASSERT_TRUE(final_rfh);
+  EXPECT_NE(final_rfh, rfh);
+  EXPECT_TRUE(final_rfh->IsRenderFrameLive());
+  EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 }
 
-// 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/");
@@ -245,12 +278,14 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, RedirectCrossSite) {
   RenderFrameHostImpl* rfh = main_test_rfh();
   EXPECT_EQ(RenderFrameHostImpl::STATE_DEFAULT, rfh->rfh_state());
   FrameTreeNode* node = main_test_rfh()->frame_tree_node();
+  RenderFrameHostManager* rfhm = node->render_manager();
 
   // Navigate to a URL on the same site.
   SendRequestNavigation(node, kUrl1);
   main_test_rfh()->SendBeginNavigationWithURL(kUrl1);
   NavigationRequest* main_request = GetNavigationRequestForFrameTreeNode(node);
   ASSERT_TRUE(main_request);
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 
   // It then redirects to another site.
   net::RedirectInfo redirect_info;
@@ -258,37 +293,41 @@ 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(rfhm));
 
   // 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());
+  RenderFrameHostImpl* final_rfh = main_test_rfh();
+  ASSERT_TRUE(final_rfh);
+  EXPECT_NE(final_rfh, rfh);
+  EXPECT_TRUE(final_rfh->IsRenderFrameLive());
+  EXPECT_TRUE(final_rfh->render_view_host()->IsRenderViewLive());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 }
 
-// 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();
+  RenderFrameHostManager* rfhm = node->render_manager();
   EXPECT_EQ(kUrl0_site, main_test_rfh()->GetSiteInstance()->GetSiteURL());
 
   // Request navigation to the 1st URL.
@@ -300,6 +339,14 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) {
   base::WeakPtr<TestNavigationURLLoader> loader1 =
       GetLoaderForNavigationRequest(request1)->AsWeakPtr();
 
+  // Confirm a speculative RFH was created.
+  ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
+  int32 site_instance_id_1 =
+      GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId();
+  EXPECT_EQ(
+      kUrl1_site,
+      GetSpeculativeRenderFrameHost(rfhm)->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);
@@ -311,23 +358,32 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, ReplacePendingNavigation) {
   // Confirm that the first loader got destroyed.
   EXPECT_FALSE(loader1);
 
+  // Confirm that a new speculative RFH was created.
+  ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
+  int32 site_instance_id_2 =
+      GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId();
+  EXPECT_NE(site_instance_id_1, site_instance_id_2);
+
   // Confirm that the commit corresponds to the new request.
   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());
+  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);
 
   FrameTreeNode* node = main_test_rfh()->frame_tree_node();
+  RenderFrameHostManager* rfhm = node->render_manager();
   SendRequestNavigationWithParameters(
       node, kUrl, Referrer(), ui::PAGE_TRANSITION_LINK,
       NavigationController::RELOAD);
@@ -338,9 +394,12 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) {
   ASSERT_TRUE(main_request != NULL);
   EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD,
             main_request->common_params().navigation_type);
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+
   int page_id = contents()->GetMaxPageIDForSiteInstance(
                     main_test_rfh()->GetSiteInstance()) + 1;
   main_test_rfh()->SendNavigate(page_id, kUrl);
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
 
   // Now do a shift+reload.
   SendRequestNavigationWithParameters(
@@ -352,6 +411,109 @@ TEST_F(NavigatorTestWithBrowserSideNavigation, Reload) {
   ASSERT_TRUE(main_request != NULL);
   EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE,
             main_request->common_params().navigation_type);
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+}
+
+// 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();
+  RenderFrameHostManager* rfhm = node->render_manager();
+  ASSERT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+
+  // Begin navigating to another site.
+  const GURL kUrl("http://google.com/");
+  SendRequestNavigation(node, kUrl);
+  contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl);
+  ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
+  EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh());
+  EXPECT_EQ(
+      SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl),
+      GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetSiteURL());
+  int32 site_instance_id =
+      GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId();
+
+  // Commit the navigation with Navigator by simulating the call to

[Charlie Reis, 2014/12/10 22:37:45]

How about: "Ask Navigator to commit the navigation by simulating..."

[carlosk, 2014/12/16 01:53:48]

Done.

+  // OnResponseStarted.
+  scoped_refptr<ResourceResponse> response(new ResourceResponse);
+  GetLoaderForNavigationRequest(GetNavigationRequestForFrameTreeNode(node))
+      ->CallOnResponseStarted(response, MakeEmptyStream());
+  EXPECT_EQ(site_instance_id, main_test_rfh()->GetSiteInstance()->GetId());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+
+  // And just for completeness invoke OnDidCommitProvisionalLoad which
+  // shouldn't change anything in RFHM.
+  FrameHostMsg_DidCommitProvisionalLoad_Params params;
+  params.page_id = 1;
+  params.url = kUrl;
+  params.was_within_same_page = false;
+  params.is_post = false;
+  params.post_id = -1;
+  params.page_state = PageState::CreateForTesting(kUrl, false, 0, 0);
+  main_test_rfh()->SendNavigateWithParams(&params);
+  EXPECT_EQ(site_instance_id, main_test_rfh()->GetSiteInstance()->GetId());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+}
+
+// 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();
+  RenderFrameHostManager* rfhm = node->render_manager();
+  ASSERT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+
+  // Begin navigating to another site.
+  const GURL kUrl("http://google.com/");
+  SendRequestNavigation(node, kUrl);
+  contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl);
+  int32 site_instance_id =
+      GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId();
+  ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
+  EXPECT_NE(GetSpeculativeRenderFrameHost(rfhm), main_test_rfh());
+  EXPECT_EQ(
+      SiteInstanceImpl::GetSiteForURL(browser_context(), kUrl),
+      GetSpeculativeRenderFrameHost(rfhm)->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);
+  ASSERT_TRUE(GetSpeculativeRenderFrameHost(rfhm));
+  EXPECT_EQ(site_instance_id,

[Charlie Reis, 2014/12/10 22:37:45]

Please add a TODO, given that the behavior (stale RFH) doesn't seem to match the
test description or desired behavior (discard on redirect).

[carlosk, 2014/12/16 01:53:48]

Done.

+            GetSpeculativeRenderFrameHost(rfhm)->GetSiteInstance()->GetId());
+
+  // Commit the navigation with Navigator by simulating the call to
+  // OnResponseStarted.
+  response = new ResourceResponse;
+  GetLoaderForNavigationRequest(main_request)
+      ->CallOnResponseStarted(response, MakeEmptyStream());
+  EXPECT_NE(site_instance_id, main_test_rfh()->GetSiteInstance()->GetId());
+  EXPECT_EQ(SiteInstanceImpl::GetSiteForURL(browser_context(), kUrlRedirect),
+            main_test_rfh()->GetSiteInstance()->GetSiteURL());
+  EXPECT_FALSE(GetSpeculativeRenderFrameHost(rfhm));
+}
+
+// PlzNavigate: Verify a previously swapped-out RenderFrameHost is correctly

[clamy, 2014/12/09 15:09:52]

s/Verify/Verify that

I would also rephrase as "is correctly used when spawning a speculative
RenderFrameHost in a navigation using the same SiteInstance".

[carlosk, 2014/12/16 01:53:48]

Done.

+// activated when speculatively selected.
+TEST_F(NavigatorTestWithBrowserSideNavigation,
+       SpeculativeRendererReuseSwappedOutRFH) {
+  FAIL() << "Must be implemented";

[carlosk, 2014/12/09 07:55:43]

Failing test that I will implement in the next PatchSet.

[clamy, 2014/12/09 15:09:52]

Acknowledged.

 }
 
 }  // namespace content