Consolidate ContentViewCore::Load* 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"
 #include "base/json/json_writer.h"
 #include "content/browser/android/content_view_client.h"
+#include "content/browser/android/load_url_params.h"
 #include "content/browser/android/touch_point.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/page_transition_types.h"
 #include "jni/ContentViewCore_jni.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::HasField;
+using base::android::JavaByteArrayToByteVector;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 
 // Describes the type and enabled state of a select popup item.
 // Keep in sync with the value defined in SelectPopupDialog.java
 enum PopupItemType {
   POPUP_ITEM_TYPE_GROUP = 0,
   POPUP_ITEM_TYPE_DISABLED,
@@ skipping 120 matching lines @@
 
 jint ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env, jobject obj,
                                              jstring script) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
 
   string16 script_utf16 = ConvertJavaStringToUTF16(env, script);
   return host->ExecuteJavascriptInWebFrameNotifyResult(string16(),
                                                        script_utf16);
 }
 
-void ContentViewCoreImpl::LoadUrlWithoutUrlSanitization(JNIEnv* env,
-                                                        jobject,
-                                                        jstring jurl,
-                                                        int page_transition) {
-  GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
+void ContentViewCoreImpl::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) {
+  DCHECK(url);
+  NavigationController::LoadURLParams params(
+      GURL(ConvertJavaStringToUTF8(env, url)));
 
-  LoadUrl(url, page_transition);
-}
+  params.load_type = static_cast<NavigationController::LoadURLType>(
+      load_url_type);
+  params.transition_type = PageTransitionFromInt(transition_type);
+  params.override_user_agent =
+      static_cast<NavigationController::UserAgentOverrideOption>(
+          ua_override_option);
 
-void ContentViewCoreImpl::LoadUrlWithoutUrlSanitizationWithUserAgentOverride(
-    JNIEnv* env,
-    jobject,
-    jstring jurl,
-    int page_transition,
-    jstring user_agent_override) {
-  GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
+  if (extra_headers)
+    params.extra_headers = ConvertJavaStringToUTF8(env, extra_headers);
 
-  LoadUrlWithUserAgentOverride(
-      url,
-      page_transition,
-      base::android::ConvertJavaStringToUTF8(env, user_agent_override));
+  if (post_data) {
+    std::vector<uint8> http_body_vector;
+    JavaByteArrayToByteVector(env, post_data, &http_body_vector);
+    params.browser_initiated_post_data =
+        base::RefCountedBytes::TakeVector(&http_body_vector);
+  }
+
+  if (base_url_for_data_url)

[Charlie Reis, 2012/08/15 17:48:38]

nit: These need braces, since the blocks don't fit on one line.

[boliu, 2012/08/15 18:36:20]

Done.

+    params.base_url_for_data_url =
+        GURL(ConvertJavaStringToUTF8(env, base_url_for_data_url));
+
+  if (virtual_url_for_data_url)
+    params.virtual_url_for_data_url =
+        GURL(ConvertJavaStringToUTF8(env, virtual_url_for_data_url));
+
+  LoadUrl(params);
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetURL(
     JNIEnv* env, jobject) const {
   return ConvertUTF8ToJavaString(env, web_contents()->GetURL().spec());
 }
 
 ScopedJavaLocalRef<jstring> ContentViewCoreImpl::GetTitle(
     JNIEnv* env, jobject obj) const {
   return ConvertUTF16ToJavaString(env, web_contents()->GetTitle());
@@ skipping 216 matching lines @@
         j_bitmap.obj());
   }
 
   return controller.GetCurrentEntryIndex();
 }
 
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
-void ContentViewCoreImpl::LoadUrl(const GURL& url, int page_transition) {
-  content::Referrer referer;
-
-  web_contents()->GetController().LoadURL(
-      url, referer, content::PageTransitionFromInt(page_transition),
-      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::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 :
-      content::NavigationController::UA_OVERRIDE_FALSE;
-
-  web_contents()->GetController().LoadURLWithParams(load_url_params);
-
-  PostLoadUrl(url);
+void ContentViewCoreImpl::LoadUrl(
+    NavigationController::LoadURLParams& params) {
+  web_contents()->GetController().LoadURLWithParams(params);
+  PostLoadUrl(params.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 148 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