Consolidate all NavigationController::LoadURL and family functions

chrome/browser/prerender/prerender_contents.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 "chrome/browser/prerender/prerender_contents.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 352 matching lines @@
 
   // Register for redirect notifications sourced from |this|.
   notification_registrar_.Add(
       this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
       content::Source<WebContents>(GetWebContents()));
 
   // Transfer over the user agent override.
   new_contents->SetUserAgentOverride(
       prerender_manager_->config().user_agent_override);
 
-  new_contents->GetController().LoadURLWithUserAgentOverride(
-      prerender_url_,
-      referrer_,
-      (origin_ == ORIGIN_OMNIBOX ? content::PAGE_TRANSITION_TYPED :
-                                   content::PAGE_TRANSITION_LINK),
-      false,
-      std::string(),
-      prerender_manager_->config().is_overriding_user_agent);
+  content::NavigationController::LoadURLParams load_url_params(
+      prerender_url_);
+  load_url_params.referrer = referrer_;
+  load_url_params.transition_type = (origin_ == ORIGIN_OMNIBOX ?
+      content::PAGE_TRANSITION_TYPED : content::PAGE_TRANSITION_LINK);
+  load_url_params.should_inherit_user_agent_override = false;
+  load_url_params.is_overriding_user_agent =
+    prerender_manager_->config().is_overriding_user_agent;
+  new_contents->GetController().LoadURLWithParams(load_url_params);
 }
 
 bool PrerenderContents::GetChildId(int* child_id) const {
   CHECK(child_id);
   DCHECK_GE(child_id_, -1);
   *child_id = child_id_;
   return child_id_ != -1;
 }
 
 bool PrerenderContents::GetRouteId(int* route_id) const {
@@ skipping 316 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender