| Index: chrome/browser/android/tab_android.cc
|
| diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
|
| index 533528fc4cc7baac2aacc91704b2207edcc643a2..d58cad73ef21d6042131cfc9ca7da2deb7e0aa8e 100644
|
| --- a/chrome/browser/android/tab_android.cc
|
| +++ b/chrome/browser/android/tab_android.cc
|
| @@ -223,13 +223,12 @@ void TabAndroid::HandlePopupNavigation(chrome::NavigateParams* params) {
|
| 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());
|
| + LOG(ERROR) << "LUKASZA: TabAndroid::HandlePopupNavigation"
|
| + << ": uses_post=" << static_cast<bool>(params->uses_post)
|
| + << ": post_data=" << static_cast<bool>(params->post_data);
|
| + if (params->uses_post && params->post_data) {
|
| + CHECK(false);
|
| + jpost_data = params->post_data->ToJavaByteArray(env);
|
| }
|
| Java_Tab_openNewTab(env,
|
| jobj.obj(),
|
| @@ -587,11 +586,11 @@ TabAndroid::TabLoadStatus TabAndroid::LoadUrl(
|
| }
|
| if (j_post_data) {
|
| load_params.load_type =
|
| - content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
|
| + content::NavigationController::LOAD_TYPE_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);
|
| + load_params.post_data = content::ResourceRequestBody::CreateFromBytes(
|
| + reinterpret_cast<const char*>(post_data.data()), post_data.size());
|
| }
|
| load_params.transition_type =
|
| ui::PageTransitionFromInt(page_transition);
|
|
|