Using ResourceRequestBody as the type of HTTP body outside of //content.

chrome/browser/android/tab_android.cc

 // Copyright 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 "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
-#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "chrome/browser/android/metrics/uma_utils.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_utils.h"
 #include "chrome/browser/android/tab_web_contents_delegate_android.h"
@@ skipping 48 matching lines @@
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/resource_request_body.h"
 #include "content/public/common/top_controls_state.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_skia.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
-using base::android::ToJavaByteArray;
 using content::BrowserThread;
 using content::GlobalRequestID;
 using content::NavigationController;
 using content::WebContents;
 using navigation_interception::InterceptNavigationDelegate;
 using navigation_interception::NavigationParams;
 
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
   if (!core_tab_helper)
@@ skipping 111 matching lines @@
   if (disposition == NEW_POPUP ||
       disposition == NEW_FOREGROUND_TAB ||
       disposition == NEW_BACKGROUND_TAB ||
       disposition == NEW_WINDOW ||
       disposition == OFF_THE_RECORD) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> jobj = weak_java_tab_.get(env);
     ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(env, url.spec()));
     ScopedJavaLocalRef<jstring> jheaders(
         ConvertUTF8ToJavaString(env, params->extra_headers));
-    ScopedJavaLocalRef<jbyteArray> jpost_data;
-    if (params->uses_post &&
-        params->browser_initiated_post_data.get() &&
-        params->browser_initiated_post_data.get()->size()) {
-      jpost_data = ToJavaByteArray(
-          env, reinterpret_cast<const uint8_t*>(
-                   params->browser_initiated_post_data.get()->front()),
-          params->browser_initiated_post_data.get()->size());
-    }
+    ScopedJavaLocalRef<jobject> jpost_data;
+    if (params->uses_post && params->post_data)
+      jpost_data = params->post_data->ToJavaObject(env);
     Java_Tab_openNewTab(env,
                         jobj.obj(),
                         jurl.obj(),
                         jheaders.obj(),
                         jpost_data.obj(),
                         disposition,
                         params->created_with_opener,
                         params->is_renderer_initiated);
   } else {
     NOTIMPLEMENTED();
@@ skipping 268 matching lines @@
     return base::android::ScopedJavaLocalRef<jobject>();
 
   return profile_android->GetJavaObject();
 }
 
 TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& url,
     const JavaParamRef<jstring>& j_extra_headers,
-    const JavaParamRef<jbyteArray>& j_post_data,
+    const JavaParamRef<jobject>& j_post_data,
     jint page_transition,
     const JavaParamRef<jstring>& j_referrer_url,
     jint referrer_policy,
     jboolean is_renderer_initiated,
     jboolean should_replace_current_entry,
     jlong intent_received_timestamp,
     jboolean has_user_gesture) {
   if (!web_contents())
     return PAGE_LOAD_FAILED;
 
@@ skipping 47 matching lines @@
     }
 
     content::NavigationController::LoadURLParams load_params(fixed_url);
     if (j_extra_headers) {
       load_params.extra_headers = base::android::ConvertJavaStringToUTF8(
           env,
           j_extra_headers);
     }
     if (j_post_data) {
       load_params.load_type =
-          content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
-      std::vector<uint8_t> post_data;
-      base::android::JavaByteArrayToByteVector(env, j_post_data, &post_data);
-      load_params.browser_initiated_post_data =
-          base::RefCountedBytes::TakeVector(&post_data);
+          content::NavigationController::LOAD_TYPE_HTTP_POST;
+      load_params.post_data =
+          content::ResourceRequestBody::FromJavaObject(env, j_post_data);
     }
     load_params.transition_type =
         ui::PageTransitionFromInt(page_transition);
     if (j_referrer_url) {
       load_params.referrer = content::Referrer(
           GURL(base::android::ConvertJavaStringToUTF8(env, j_referrer_url)),
           static_cast<blink::WebReferrerPolicy>(referrer_policy));
     }
     const base::string16 search_terms =
         search::ExtractSearchTermsFromURL(GetProfile(), gurl);
@@ skipping 305 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }