PlzNavigate: have renderer-initiated navigations be same-process

content/test/test_render_frame_host.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/test_render_frame_host.h"
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
@@ skipping 181 matching lines @@
   BeginNavigationParams begin_params("GET", std::string(), net::LOAD_NORMAL,
                                      has_user_gesture);
   CommonNavigationParams common_params;
   common_params.url = url;
   common_params.referrer = Referrer(GURL(), blink::WebReferrerPolicyDefault);
   common_params.transition = ui::PAGE_TRANSITION_LINK;
   OnBeginNavigation(common_params, begin_params,
                     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();
 }
 
 void TestRenderFrameHost::PrepareForCommit(const GURL& url) {

[clamy, 2015/02/23 10:52:34]

Now that url is not used in that function, it should be removed from the
parameters (it was only included because of the SendBeginNavigation there
before).

[carlosk, 2015/03/04 19:42:40]

Change was moved to another CL.

   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     SendBeforeUnloadACK(true);
     return;
   }
 
   // PlzNavigate
   // Simulate the network stack commit without any redirects.
   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.
   if (request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE)
     SendBeforeUnloadACK(true);
 
   // We have already simulated the IO thread commit. Only the
   // DidCommitProvisionalLoad from the renderer is missing.
   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());
 }
 
 void TestRenderFrameHost::SendBeforeUnloadHandlersPresent(bool present) {
   OnBeforeUnloadHandlersPresent(present);
 }
 
 void TestRenderFrameHost::SendUnloadHandlersPresent(bool present) {
   OnUnloadHandlersPresent(present);
 }
 
 }  // namespace content