Consolidate all NavigationController::LoadURL and family functions

chrome/browser/instant/instant_loader.cc

Index: chrome/browser/instant/instant_loader.cc
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc
index 28dad8f8ddd82fd9bb6b52a1e07a65718b4fdc76..c94f60bf9a719e6a06d9110b9cbc6b72a81b5e80 100644
--- a/chrome/browser/instant/instant_loader.cc
+++ b/chrome/browser/instant/instant_loader.cc
@@ -756,9 +756,13 @@ bool InstantLoader::Update(TabContents* tab_contents,
     preview_tab_contents_delegate_->PrepareForNewLoad();
     frame_load_observer_.reset(NULL);
 
+    content::NavigationController::LoadURLParams load_url_params(url_);
+    load_url_params.transition_type = transition_type;
+    load_url_params.override_user_agent = override_user_agent ?
+        content::NavigationController::UA_OVERRIDE_TRUE :
+        content::NavigationController::UA_OVERRIDE_FALSE;
     preview_contents_->web_contents()->GetController().
-        LoadURLWithUserAgentOverride(url_, content::Referrer(), transition_type,
-            false, std::string(), override_user_agent);
+        LoadURLWithParams(load_url_params);
   }
   return true;
 }
@@ -1176,9 +1180,14 @@ void InstantLoader::LoadInstantURL(const TemplateURL* template_url,
   if (cl->HasSwitch(switches::kInstantURL))
     instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL));
 
+  content::NavigationController::LoadURLParams load_url_params(
+      instant_url);
+  load_url_params.transition_type = transition_type;
+  load_url_params.override_user_agent = override_user_agent ?
+      content::NavigationController::UA_OVERRIDE_TRUE :
+      content::NavigationController::UA_OVERRIDE_FALSE;
   preview_contents_->web_contents()->GetController().
-      LoadURLWithUserAgentOverride(instant_url, content::Referrer(),
-          transition_type, false, std::string(), override_user_agent);
+      LoadURLWithParams(load_url_params);
 
   RenderViewHost* host = preview_contents_->web_contents()->GetRenderViewHost();
   preview_contents_->web_contents()->WasHidden();