PlzNavigate: have renderer-initiated navigations be same-process

content/test/test_render_frame_host.cc

Index: content/test/test_render_frame_host.cc
diff --git a/content/test/test_render_frame_host.cc b/content/test/test_render_frame_host.cc
index 9249d2609ab7ce9f6e779c4223cb2112a8edbb0e..a4a5c3221ce4ac2b16862d7978695f9ad359898a 100644
--- a/content/test/test_render_frame_host.cc
+++ b/content/test/test_render_frame_host.cc
@@ -199,6 +199,14 @@ void TestRenderFrameHost::SendBeginNavigationWithURL(const GURL& url,
                     scoped_refptr<ResourceRequestBody>());
 }
 
+void TestRenderFrameHost::RendererRequestIfPlzNavigate(const GURL& url,
+                                                       bool has_user_gesture) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation)) {
+    SendBeginNavigationWithURL(url, has_user_gesture);
+  }
+}
+
 void TestRenderFrameHost::DidDisownOpener() {
   OnDidDisownOpener();
 }
@@ -215,14 +223,10 @@ void TestRenderFrameHost::PrepareForCommit(const GURL& url) {
   NavigationRequest* request =
       static_cast<NavigatorImpl*>(frame_tree_node_->navigator())
           ->GetNavigationRequestForNodeForTesting(frame_tree_node_);
-
-  // We are simulating a renderer-initiated user-initiated navigation.
-  if (!request) {
-    SendBeginNavigationWithURL(url, true);
-    request = static_cast<NavigatorImpl*>(frame_tree_node_->navigator())
-        ->GetNavigationRequestForNodeForTesting(frame_tree_node_);
-  }
-  ASSERT_TRUE(request);
+  CHECK(request && request->common_params().url == url)
+      << " Request URL: "
+      << (request ? request->common_params().url.possibly_invalid_spec()
+                  : "<NO REQUEST>") << ", commit URL: " << url;
 
   // We may not have simulated the renderer response to the navigation request.
   // Do that now.
@@ -234,10 +238,10 @@ void TestRenderFrameHost::PrepareForCommit(const GURL& url) {
   if (request->state() == NavigationRequest::RESPONSE_STARTED)
     return;
 
-  ASSERT_TRUE(request->state() == NavigationRequest::STARTED);
+  CHECK(request->state() == NavigationRequest::STARTED);
   TestNavigationURLLoader* url_loader =
       static_cast<TestNavigationURLLoader*>(request->loader_for_testing());
-  ASSERT_TRUE(url_loader);
+  CHECK(url_loader);

[carlosk, 2015/02/20 19:16:51]

These two replacements with CHECK are a bugfix as the previously used ASSERTs
there will *not* trigger a test failure (see
https://code.google.com/p/googletest/wiki/AdvancedGuide#Using_Assertions_in_S...)

   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   url_loader->CallOnResponseStarted(response, MakeEmptyStream());
 }