Moving HTTP POST body from StartNavigationParams to CommonNavigationParams.

content/browser/frame_host/navigation_entry_impl.cc

Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 81931e4b00a3c1788aa5f836f0e0888cd86bf4dd..cd0d68a1cdd6032dc3688bcaa0b4277b90b0351a 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -18,6 +18,7 @@
 #include "content/common/content_constants_internal.h"
 #include "content/common/navigation_params.h"
 #include "content/common/page_state_serialization.h"
+#include "content/common/resource_request_body.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_constants.h"
@@ -569,8 +570,22 @@ std::unique_ptr<NavigationEntryImpl> NavigationEntryImpl::CloneAndReplace(
   return copy;
 }
 
+scoped_refptr<ResourceRequestBody>
+NavigationEntryImpl::ConstructBodyFromBrowserInitiatedPostData() const {
+  scoped_refptr<ResourceRequestBody> browser_initiated_post_body;
+  if (GetHasPostData()) {

[Charlie Reis, 2016/05/23 18:14:10]

This check wasn't included before, but it seems reasonable to me.  Hopefully no
one was forgetting to set the method before when using browser-initiated POST
data.

[Łukasz Anforowicz, 2016/05/23 18:38:47]

Acknowledged.

+    if (const base::RefCountedMemory* memory = GetBrowserInitiatedPostData()) {
+      browser_initiated_post_body = new ResourceRequestBody();
+      browser_initiated_post_body->AppendBytes(memory->front_as<char>(),
+                                               memory->size());
+    }
+  }
+  return browser_initiated_post_body;
+}
+
 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
     const FrameNavigationEntry& frame_entry,
+    const scoped_refptr<ResourceRequestBody>& post_body,
     const GURL& dest_url,
     const Referrer& dest_referrer,
     FrameMsg_Navigate_Type::Value navigation_type,
@@ -592,26 +607,19 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
   if (IsBrowserSideNavigationEnabled())
     method = frame_entry.method();
   else
-    method = GetHasPostData() ? "POST" : "GET";
+    method = (post_body.get() || GetHasPostData()) ? "POST" : "GET";
 
   return CommonNavigationParams(
       dest_url, dest_referrer, GetTransitionType(), navigation_type,
       !IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,
       GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state,
-      navigation_start, method);
+      navigation_start, method,
+      post_body ? post_body : ConstructBodyFromBrowserInitiatedPostData());
 }
 
 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
     const {
-  std::vector<unsigned char> browser_initiated_post_data;
-  if (GetBrowserInitiatedPostData()) {
-    browser_initiated_post_data.assign(
-        GetBrowserInitiatedPostData()->front(),
-        GetBrowserInitiatedPostData()->front() +
-            GetBrowserInitiatedPostData()->size());
-  }
-
-  return StartNavigationParams(extra_headers(), browser_initiated_post_data,
+  return StartNavigationParams(extra_headers(),
 #if defined(OS_ANDROID)
                                has_user_gesture(),
 #endif