Consolidate all NavigationController::LoadURL and family functions

content/browser/android/content_view_core_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/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 397 matching lines @@
       std::string());
   PostLoadUrl(url);
 }
 
 void ContentViewCoreImpl::LoadUrlWithUserAgentOverride(
     const GURL& url,
     int page_transition,
     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);
 }
 
 void ContentViewCoreImpl::PostLoadUrl(const GURL& url) {
   tab_crashed_ = false;
   // TODO(tedchoc): Update the content view client of the page load request.
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
@@ skipping 154 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content