PlzNavigate: Fix the http/tests/loading/307-after-303-after-post.html and the http/tests/loading/re…

content/renderer/render_frame_impl.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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 3405 matching lines @@
           DocumentState::FromDataSource(datasource)))
     return;
 
   ServiceWorkerNetworkProvider::AttachToDocumentState(
       DocumentState::FromDataSource(datasource),
       ServiceWorkerNetworkProvider::CreateForNavigation(
           routing_id_, navigation_state->request_params(), frame,
           content_initiated));
 }
 
-void RenderFrameImpl::didStartProvisionalLoad(
-    blink::WebDataSource* data_source) {
+void RenderFrameImpl::didStartProvisionalLoad(blink::WebDataSource* data_source,
+                                              blink::WebURLRequest& request) {
   // In fast/loader/stop-provisional-loads.html, we abort the load before this
   // callback is invoked.
   if (!data_source)
     return;
 
   TRACE_EVENT2("navigation,benchmark,rail",
                "RenderFrameImpl::didStartProvisionalLoad", "id", routing_id_,
                "url", data_source->getRequest().url().string().utf8());
+
+  // PlzNavigate:
+  // If we have pending navigation to be sent to the browser, do it here.

[clamy, 2017/03/13 16:03:33]

nit: s/pending navigation/a pending navigation

[ananta, 2017/03/13 19:57:07]

Thanks Done.

+  if (pending_navigation_info_.get()) {
+    DCHECK(IsBrowserSideNavigationEnabled());
+    NavigationPolicyInfo info(request);
+    info.navigationType = pending_navigation_info_->navigation_type;
+    info.defaultPolicy = pending_navigation_info_->policy;
+    info.replacesCurrentHistoryItem =
+        pending_navigation_info_->replaces_current_history_item;
+    info.isHistoryNavigationInNewChildFrame =
+        pending_navigation_info_->history_navigation_in_new_child_frame;
+    info.isClientRedirect = pending_navigation_info_->client_redirect;
+    info.isCacheDisabled = pending_navigation_info_->cache_disabled;
+    info.form = pending_navigation_info_->form;
+
+    pending_navigation_info_.reset(nullptr);
+
+    BeginNavigation(info);
+  }
+
   DocumentState* document_state = DocumentState::FromDataSource(data_source);
   NavigationStateImpl* navigation_state = static_cast<NavigationStateImpl*>(
       document_state->navigation_state());
   bool is_top_most = !frame_->parent();
   if (is_top_most) {
     render_view_->set_navigation_gesture(
         WebUserGestureIndicator::isProcessingUserGesture() ?
             NavigationGestureUser : NavigationGestureAuto);
   } else if (data_source->replacesCurrentHistoryItem()) {
     // Subframe navigations that don't add session history items must be
@@ skipping 2024 matching lines @@
           base::TimeTicks::Now();
     }
   }
 
   // PlzNavigate: if the navigation is not synchronous, send it to the browser.
   // This includes navigations with no request being sent to the network stack.
   if (IsBrowserSideNavigationEnabled() &&
       info.urlRequest.checkForBrowserSideNavigation() &&
       ShouldMakeNetworkRequestForURL(url)) {
     if (info.defaultPolicy == blink::WebNavigationPolicyCurrentTab) {
-      BeginNavigation(info);
+      // The BeginNavigation() call happens in didStartProvisionalLoad(). We
+      // need to save information about the navigation here.
+      pending_navigation_info_.reset(new PendingNavigationInfo(info));
       return blink::WebNavigationPolicyHandledByClient;
     } else {
       LoadURLExternally(info.urlRequest, info.defaultPolicy);
       return blink::WebNavigationPolicyIgnore;
     }
   }
 
   return info.defaultPolicy;
 }
 
@@ skipping 357 matching lines @@
   Send(new FrameHostMsg_OpenURL(routing_id_, params));
 }
 
 void RenderFrameImpl::NavigateInternal(
     const CommonNavigationParams& common_params,
     const StartNavigationParams& start_params,
     const RequestNavigationParams& request_params,
     std::unique_ptr<StreamOverrideParameters> stream_params) {
   bool browser_side_navigation = IsBrowserSideNavigationEnabled();
 
-  // Lower bound for browser initiated navigation start time.
+  // PlzNavigate
+  // Clear pending navigations which weren't sent to the browser because we
+  // did not get a didStartProvisionalLoad() notification for them.
+  pending_navigation_info_.reset(nullptr);
+
+  // Lower bound for browser initiated navigation start timepending_navigation_info_

[clamy, 2017/03/13 16:03:33]

I think this is an involuntary change :). Remove it?

[ananta, 2017/03/13 19:57:07]

Done.

   base::TimeTicks renderer_navigation_start = base::TimeTicks::Now();
   bool is_reload =
       FrameMsg_Navigate_Type::IsReload(common_params.navigation_type);
   bool is_history_navigation = request_params.page_state.IsValid();
   WebCachePolicy cache_policy = WebCachePolicy::UseProtocolCachePolicy;
   RenderFrameImpl::PrepareRenderViewForNavigation(
       common_params.url, request_params);
 
   GetContentClient()->SetActiveURL(common_params.url);
 
@@ skipping 1001 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content