Consolidate all NavigationController::LoadURL and family functions

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index f50b048c97c9dc96cae95ecff48cda792ad41937..a474cda5d78c6393fe523181e06753c2520e85b8 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -415,10 +415,16 @@ void ContentViewCoreImpl::LoadUrlWithUserAgentOverride(
     const std::string& user_agent_override) {
   web_contents()->SetUserAgentOverride(user_agent_override);
   bool is_overriding_user_agent(!user_agent_override.empty());
-  content::Referrer referer;
-  web_contents()->GetController().LoadURLWithUserAgentOverride(
-      url, referer, content::PageTransitionFromInt(page_transition),
-      false, std::string(), is_overriding_user_agent);
+
+  content::NavigationController::LoadURLParams load_url_params(url);
+  load_url_params.transition_type =
+      content::PageTransitionFromInt(page_transition);
+  load_url_params.override_user_agent = is_overriding_user_agent ?
+        content::NavigationController::UA_OVERRIDE_TRUE :

[Charlie Reis, 2012/08/03 23:12:48]

Too much indent here.

[boliu, 2012/08/03 23:31:39]

Done.

+        content::NavigationController::UA_OVERRIDE_FALSE;
+
+  web_contents()->GetController().LoadURLWithParams(load_url_params);
+
   PostLoadUrl(url);
 }