Index: content/browser/frame_host/navigation_controller_android.cc |
diff --git a/content/browser/frame_host/navigation_controller_android.cc b/content/browser/frame_host/navigation_controller_android.cc |
index 840771550f493682f02002173b6392b3187a9e8a..905757c65ffb1e24d52385c2ecdb9768305289de 100644 |
--- a/content/browser/frame_host/navigation_controller_android.cc |
+++ b/content/browser/frame_host/navigation_controller_android.cc |
@@ -7,12 +7,12 @@ |
#include <stdint.h> |
#include "base/android/jni_android.h" |
-#include "base/android/jni_array.h" |
#include "base/android/jni_string.h" |
#include "content/browser/frame_host/navigation_controller_impl.h" |
#include "content/browser/frame_host/navigation_entry_impl.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/ssl_host_state_delegate.h" |
+#include "content/public/common/resource_request_body.h" |
#include "jni/NavigationControllerImpl_jni.h" |
#include "net/base/data_url.h" |
#include "ui/gfx/android/java_bitmap.h" |
@@ -202,7 +202,7 @@ void NavigationControllerAndroid::LoadUrl( |
jint referrer_policy, |
jint ua_override_option, |
const JavaParamRef<jstring>& extra_headers, |
- const JavaParamRef<jbyteArray>& post_data, |
+ const JavaParamRef<jobject>& j_post_data, |
const JavaParamRef<jstring>& base_url_for_data_url, |
const JavaParamRef<jstring>& virtual_url_for_data_url, |
const JavaParamRef<jstring>& data_url_as_string, |
@@ -226,12 +226,7 @@ void NavigationControllerAndroid::LoadUrl( |
if (extra_headers) |
params.extra_headers = ConvertJavaStringToUTF8(env, extra_headers); |
- if (post_data) { |
- std::vector<uint8_t> http_body_vector; |
- base::android::JavaByteArrayToByteVector(env, post_data, &http_body_vector); |
- params.browser_initiated_post_data = |
- base::RefCountedBytes::TakeVector(&http_body_vector); |
- } |
+ params.post_data = ResourceRequestBody::FromJavaObject(env, j_post_data); |
if (base_url_for_data_url) { |
params.base_url_for_data_url = |