PlzNavigate: track pending commits

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 182 matching lines @@
   params.page_state = PageState::CreateForTesting(
       url,
       false,
       file_path_for_history_item ? "data" : NULL,
       file_path_for_history_item);
 
   FrameHostMsg_DidCommitProvisionalLoad msg(GetRoutingID(), params);
   OnDidCommitProvisionalLoad(msg);
 }
 
+void TestRenderFrameHost::NavigateAndCommitRendererInitiated(int page_id,
+                                                             const GURL& url) {
+  SendRendererInitiatedNavigationRequest(url, false);
+  PrepareForCommit();
+  SendNavigate(page_id, url);
+}
+
 void TestRenderFrameHost::SendRendererInitiatedNavigationRequest(
     const GURL& url,
     bool has_user_gesture) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     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::DidDisownOpener() {
   OnDidDisownOpener();
 }
 
 void TestRenderFrameHost::PrepareForCommit() {
   PrepareForCommitWithServerRedirect(GURL());
 }
 
 void TestRenderFrameHost::PrepareForCommitWithServerRedirect(
     const GURL& redirect_url) {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserSideNavigation)) {
     // Non PlzNavigate
-    SendBeforeUnloadACK(true);
+    if (IsWaitingForBeforeUnloadACK())

[clamy, 2015/04/02 12:52:35]

This is necessary if PrepareForCommit is called on a subframe.

+      SendBeforeUnloadACK(true);
     return;
   }
 
   // PlzNavigate
   NavigationRequest* request =
       static_cast<NavigatorImpl*>(frame_tree_node_->navigator())
           ->GetNavigationRequestForNodeForTesting(frame_tree_node_);
   CHECK(request);
 
   // Simulate a beforeUnload ACK from the renderer if the browser is waiting for
@@ skipping 19 matching lines @@
     url_loader->SimulateServerRedirect(redirect_url);
 
   // Simulate the network stack commit.
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   // TODO(carlosk): ideally with PlzNavigate it should be possible someday to
   // fully commit the navigation at this call to CallOnResponseStarted.
   url_loader->CallOnResponseStarted(response, MakeEmptyStream());
 }
 
 }  // namespace content