Refactor NavigationState to use NavigationParams

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 67 matching lines @@
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/idle_user_detector.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/internal_document_state_data.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/mhtml_generator.h"
+#include "content/renderer/navigation_state_impl.h"
 #include "content/renderer/net_info_helper.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_mouse_lock_dispatcher.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 #include "content/renderer/resizing_mode_selector.h"
 #include "content/renderer/savable_resources.h"
@@ skipping 2024 matching lines @@
           InternalDocumentStateData::FromDocumentState(old_document_state);
       internal_data->set_is_overriding_user_agent(
           old_internal_data->is_overriding_user_agent());
     }
   }
 
   // The rest of RenderView assumes that a WebDataSource will always have a
   // non-null NavigationState.
   if (content_initiated) {
     document_state->set_navigation_state(
-        NavigationState::CreateContentInitiated());
+        NavigationStateImpl::CreateContentInitiated());
   } else {
     document_state->set_navigation_state(CreateNavigationStateFromPending());
     pending_navigation_params_.reset();
   }
 
   // DocumentState::referred_by_prefetcher_ is true if we are
   // navigating from a page that used prefetching using a link on that
   // page.  We are early enough in the request process here that we
   // can still see the DocumentState of the previous page and set
   // this value appropriately.
@@ skipping 80 matching lines @@
   internal_data->set_is_overriding_user_agent(
       pending_navigation_params_->commit_params.is_overriding_user_agent);
   internal_data->set_must_reset_scroll_and_scale_state(
       pending_navigation_params_->common_params.navigation_type ==
       FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL);
   document_state->set_can_load_local_resources(
       pending_navigation_params_->commit_params.can_load_local_resources);
 }
 
 NavigationState* RenderViewImpl::CreateNavigationStateFromPending() {
-  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 (!pending_navigation_params_->common_params.url.SchemeIs(
           url::kJavaScriptScheme)) {
-    navigation_state = NavigationState::CreateBrowserInitiated(
-        pending_navigation_params_->history_params.page_id,
-        pending_navigation_params_->history_params.pending_history_list_offset,
-        pending_navigation_params_->history_params.should_clear_history_list,
-        pending_navigation_params_->common_params.transition);
-    navigation_state->set_allow_download(
-        pending_navigation_params_->common_params.allow_download);
-    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableBrowserSideNavigation)) {
-      navigation_state->set_should_replace_current_entry(
-          pending_navigation_params_->start_params
-              .should_replace_current_entry);
-      navigation_state->set_transferred_request_child_id(
-          pending_navigation_params_->start_params
-              .transferred_request_child_id);
-      navigation_state->set_transferred_request_request_id(
-          pending_navigation_params_->start_params
-              .transferred_request_request_id);
-      navigation_state->set_extra_headers(
-          pending_navigation_params_->start_params.extra_headers);
-    }
-  } else {
-    navigation_state = NavigationState::CreateContentInitiated();
+    return NavigationStateImpl::CreateBrowserInitiated(
+        pending_navigation_params_->common_params,
+        pending_navigation_params_->start_params,
+        pending_navigation_params_->history_params);
   }
-  return navigation_state;
+  return NavigationStateImpl::CreateContentInitiated();
 }
 
 void RenderViewImpl::didChangeIcon(WebLocalFrame* frame,
                                    WebIconURL::Type icon_type) {
   if (frame->parent())
     return;
 
   if (!TouchEnabled() && icon_type != WebIconURL::TypeFavicon)
     return;
 
@@ skipping 1719 matching lines @@
     std::vector<gfx::Size> sizes;
     ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
     if (!url.isEmpty())
       urls.push_back(
           FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
   }
   SendUpdateFaviconURL(urls);
 }
 
 }  // namespace content