PlzNavigate: make content unit tests work with browser side navigation

content/browser/frame_host/navigator_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/browser/frame_host/navigator_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
@@ skipping 815 matching lines @@
   // we properly cancel ongoing navigations.
   frame_tree_node->render_manager()->CleanUpNavigation();
 }
 
 // PlzNavigate
 NavigationRequest* NavigatorImpl::GetNavigationRequestForNodeForTesting(
     FrameTreeNode* frame_tree_node) {
   return navigation_request_map_.get(frame_tree_node->frame_tree_node_id());
 }
 
+bool NavigatorImpl::IsWaitingForBeforeUnloadACK(
+    FrameTreeNode* frame_tree_node) {
+  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableBrowserSideNavigation));
+  NavigationRequest* request =
+    navigation_request_map_.get(frame_tree_node->frame_tree_node_id());

[nasko, 2015/01/21 17:21:33]

nit: indent two more spaces

[clamy, 2015/01/21 19:39:41]

Done.

+  if (!request)
+    return false;
+  return request->state() == NavigationRequest::WAITING_FOR_RENDERER_RESPONSE;
+}
+
 void NavigatorImpl::LogResourceRequestTime(
     base::TimeTicks timestamp, const GURL& url) {
   if (navigation_data_ && navigation_data_->url_ == url) {
     navigation_data_->url_job_start_time_ = timestamp;
     UMA_HISTOGRAM_TIMES(
         "Navigation.TimeToURLJobStart",
         navigation_data_->url_job_start_time_ - navigation_data_->start_time_);
   }
 }
 
@@ skipping 30 matching lines @@
     FrameTreeNode* frame_tree_node,
     const NavigationEntryImpl& entry,
     NavigationController::ReloadType reload_type,
     base::TimeTicks navigation_start) {
   CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableBrowserSideNavigation));
   DCHECK(frame_tree_node);
   int64 frame_tree_node_id = frame_tree_node->frame_tree_node_id();
   FrameMsg_Navigate_Type::Value navigation_type =
       GetNavigationType(controller_->GetBrowserContext(), entry, reload_type);
-  scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
-      frame_tree_node,
-      CommonNavigationParams(entry.GetURL(), entry.GetReferrer(),
-                             entry.GetTransitionType(), navigation_type,
-                             !entry.IsViewSourceMode()),
-      CommitNavigationParams(entry.GetPageState(),
-                             entry.GetIsOverridingUserAgent(),
-                             navigation_start),
-      &entry));
+  scoped_ptr<NavigationRequest> navigation_request = NavigationRequest::Create(
+      frame_tree_node, entry, navigation_type, navigation_start);
   RequestNavigationParams request_params(entry.GetHasPostData(),
                                          entry.extra_headers(),
                                          entry.GetBrowserInitiatedPostData());
   // TODO(clamy): Check if navigations are blocked and if so store the
   // parameters.
 
   // If there is an ongoing request, replace it.
   navigation_request_map_.set(frame_tree_node_id, navigation_request.Pass());
 
   if (frame_tree_node->current_frame_host()->IsRenderFrameLive()) {
@@ skipping 61 matching lines @@
         "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_commit);
     UMA_HISTOGRAM_TIMES(
         "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
         time_to_network);
   }
   navigation_data_.reset();
 }
 
 }  // namespace content