Remove the FrameMsg_Navigate_Params

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index ff77a10a02974be7911733427af5fd1b394ebfc4..48242b6e724f176a794705a7117d67f1967ff1f0 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2120,13 +2120,20 @@ const std::string& RenderViewImpl::GetAcceptLanguages() const {
 
 void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame,
                                          WebDataSource* ds) {
-  bool content_initiated = !pending_navigation_params_.get();
+  bool content_initiated = !pending_common_params_.get();
+  bool browser_side_navigation_enabled =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation);
+  CHECK(content_initiated || pending_commit_params_.get());
+  CHECK(content_initiated || pending_history_params_.get());
+  CHECK(content_initiated || pending_start_params_.get() ||
+        browser_side_navigation_enabled);
 
   // Make sure any previous redirect URLs end up in our new data source.
-  if (pending_navigation_params_.get()) {
+  if (pending_commit_params_.get()) {
     for (std::vector<GURL>::const_iterator i =
-             pending_navigation_params_->redirects.begin();
-         i != pending_navigation_params_->redirects.end(); ++i) {
+             pending_commit_params_->redirects.begin();
+         i != pending_commit_params_->redirects.end(); ++i) {
       ds->appendRedirect(*i);
     }
   }
@@ -2162,7 +2169,10 @@ void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame,
         NavigationState::CreateContentInitiated());
   } else {
     document_state->set_navigation_state(CreateNavigationStateFromPending());
-    pending_navigation_params_.reset();
+    pending_common_params_.reset();
+    pending_start_params_.reset();
+    pending_commit_params_.reset();
+    pending_history_params_.reset();
   }
 
   // DocumentState::referred_by_prefetcher_ is true if we are
@@ -2219,14 +2229,14 @@ void RenderViewImpl::didCreateDataSource(WebLocalFrame* frame,
 
 void RenderViewImpl::PopulateDocumentStateFromPending(
     DocumentState* document_state) {
-  const FrameMsg_Navigate_Params& params = *pending_navigation_params_.get();
-  document_state->set_request_time(params.request_time);
+  document_state->set_request_time(pending_commit_params_->request_time);
 
   InternalDocumentStateData* internal_data =
       InternalDocumentStateData::FromDocumentState(document_state);
 
-  if (!params.common_params.url.SchemeIs(url::kJavaScriptScheme) &&
-      params.common_params.navigation_type == FrameMsg_Navigate_Type::RESTORE) {
+  if (!pending_common_params_->url.SchemeIs(url::kJavaScriptScheme) &&
+      pending_common_params_->navigation_type ==
+          FrameMsg_Navigate_Type::RESTORE) {
     // We're doing a load of a page that was restored from the last session. By
     // default this prefers the cache over loading (LOAD_PREFERRING_CACHE) which
     // can result in stale data for pages that are set to expire. We explicitly
@@ -2241,42 +2251,46 @@ void RenderViewImpl::PopulateDocumentStateFromPending(
         WebURLRequest::UseProtocolCachePolicy);
   }
 
-  if (IsReload(params.common_params.navigation_type))
+  if (IsReload(pending_common_params_->navigation_type))
     document_state->set_load_type(DocumentState::RELOAD);
-  else if (params.history_params.page_state.IsValid())
+  else if (pending_history_params_->page_state.IsValid())
     document_state->set_load_type(DocumentState::HISTORY_LOAD);
   else
     document_state->set_load_type(DocumentState::NORMAL_LOAD);
 
   internal_data->set_is_overriding_user_agent(
-      params.commit_params.is_overriding_user_agent);
+      pending_commit_params_->is_overriding_user_agent);
   internal_data->set_must_reset_scroll_and_scale_state(
-      params.common_params.navigation_type ==
+      pending_common_params_->navigation_type ==
       FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL);
-  document_state->set_can_load_local_resources(params.can_load_local_resources);
+  document_state->set_can_load_local_resources(
+      pending_commit_params_->can_load_local_resources);
 }
 
 NavigationState* RenderViewImpl::CreateNavigationStateFromPending() {
-  const FrameMsg_Navigate_Params& params = *pending_navigation_params_.get();
   NavigationState* navigation_state = NULL;
 
   // A navigation resulting from loading a javascript URL should not be treated
   // as a browser initiated event.  Instead, we want it to look as if the page
   // initiated any load resulting from JS execution.
-  if (!params.common_params.url.SchemeIs(url::kJavaScriptScheme)) {
+  if (!pending_common_params_->url.SchemeIs(url::kJavaScriptScheme)) {
     navigation_state = NavigationState::CreateBrowserInitiated(

[clamy, 2015/03/09 14:34:47]

As explained in render_frame_impl.cc, the next goal is to have NavigationState
take ownership of the pending HistoryNavigationParams and StartNavigationParams
here, which should make this cleaner.

-        params.history_params.page_id,
-        params.history_params.pending_history_list_offset,
-        params.history_params.should_clear_history_list,
-        params.common_params.transition);
-    navigation_state->set_should_replace_current_entry(
-        params.should_replace_current_entry);
-    navigation_state->set_transferred_request_child_id(
-        params.transferred_request_child_id);
-    navigation_state->set_transferred_request_request_id(
-        params.transferred_request_request_id);
-    navigation_state->set_allow_download(params.common_params.allow_download);
-    navigation_state->set_extra_headers(params.extra_headers);
+        pending_history_params_->page_id,
+        pending_history_params_->pending_history_list_offset,
+        pending_history_params_->should_clear_history_list,
+        pending_common_params_->transition);
+    navigation_state->set_allow_download(
+        pending_common_params_->allow_download);
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableBrowserSideNavigation)) {
+      navigation_state->set_should_replace_current_entry(
+          pending_start_params_->should_replace_current_entry);
+      navigation_state->set_transferred_request_child_id(
+          pending_start_params_->transferred_request_child_id);
+      navigation_state->set_transferred_request_request_id(
+          pending_start_params_->transferred_request_request_id);
+      navigation_state->set_extra_headers(pending_start_params_->extra_headers);
+    }
   } else {
     navigation_state = NavigationState::CreateContentInitiated();
   }