Consolidate ContentViewCore::Load* functions

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_helper.h"
@@ skipping 29 matching lines @@
   virtual void Destroy(JNIEnv* env, jobject obj) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
   // --------------------------------------------------------------------------
 
   // Notifies the ContentViewCore that items were selected in the currently
   // showing select popup.
   void SelectPopupMenuItems(JNIEnv* env, jobject obj, jintArray indices);
 
-  void LoadUrlWithoutUrlSanitization(JNIEnv* env,
-                                     jobject,
-                                     jstring jurl,
-                                     int page_transition);
-  void LoadUrlWithoutUrlSanitizationWithUserAgentOverride(
-      JNIEnv* env,
-      jobject,
-      jstring jurl,
-      int page_transition,
-      jstring user_agent_override);
+  void LoadUrl(
+      JNIEnv* env, jobject obj,
+      jstring url,
+      jint load_url_type,
+      jint transition_type,
+      jint ua_override_option,
+      jstring extra_headers,
+      jbyteArray post_data,
+      jstring base_url_for_data_url,
+      jstring virtual_url_for_data_url);
   base::android::ScopedJavaLocalRef<jstring> GetURL(JNIEnv* env, jobject) const;
   base::android::ScopedJavaLocalRef<jstring> GetTitle(
       JNIEnv* env, jobject obj) const;
   jboolean IsIncognito(JNIEnv* env, jobject obj);
   jboolean Crashed(JNIEnv* env, jobject obj) const { return tab_crashed_; }
   jboolean TouchEvent(JNIEnv* env,
                       jobject obj,
                       jlong time_ms,
                       jint type,
                       jobjectArray pts);
@@ skipping 81 matching lines @@
   void DidStartLoading();
   void StartContentIntent(const GURL& content_url);
 
   // --------------------------------------------------------------------------
   // Methods called from native code
   // --------------------------------------------------------------------------
 
   gfx::Rect GetBounds() const;
 
   WebContents* web_contents() const { return web_contents_; }
-  void LoadUrl(const GURL& url, int page_transition);
-  void LoadUrlWithUserAgentOverride(
-      const GURL& url,
-      int page_transition,
-      const std::string& user_agent_override);
+
+  virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
 
  private:
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // --------------------------------------------------------------------------
   // Private methods that call to Java via JNI
   // --------------------------------------------------------------------------
@@ skipping 32 matching lines @@
   bool tab_crashed_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_