PlzNavigate: store POST data in the FrameNavigationEntry

content/browser/frame_host/navigation_entry_impl.cc

 // Copyright 2013 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/frame_host/navigation_entry_impl.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/navigation_params.h"
 #include "content/common/page_state_serialization.h"
 #include "content/common/site_isolation_policy.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "ui/gfx/text_elider.h"
 
 using base::UTF16ToUTF8;
 
 namespace content {
 
 namespace {
 
@@ skipping 534 matching lines @@
   copy->redirect_chain_ = redirect_chain_;
   // ResetForCommit: should_clear_history_list_
   // ResetForCommit: frame_tree_node_id_
   // ResetForCommit: intent_received_timestamp_
   copy->extra_data_ = extra_data_;
 
   return copy;
 }
 
 CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
+    const FrameNavigationEntry& frame_entry,
     const GURL& dest_url,
     const Referrer& dest_referrer,
     FrameMsg_Navigate_Type::Value navigation_type,
     LoFiState lofi_state,
     const base::TimeTicks& navigation_start) const {
   FrameMsg_UILoadMetricsReportType::Value report_type =
       FrameMsg_UILoadMetricsReportType::NO_REPORT;
   base::TimeTicks ui_timestamp = base::TimeTicks();
 #if defined(OS_ANDROID)
   if (!intent_received_timestamp().is_null())
     report_type = FrameMsg_UILoadMetricsReportType::REPORT_INTENT;
   ui_timestamp = intent_received_timestamp();
 #endif
 
+  std::string method;
+
+  if (IsBrowserSideNavigationEnabled())

[Charlie Reis, 2016/05/11 00:00:23]

At some point, I think we'll need this in all UseSubframeNavigationEntries
modes, not just PlzNavigate.  (It's necessary for fixing transfers in
--isolate-extensions, as we noted on the bug.)

If you want this CL to stay focused on PlzNavigate, please put a TODO to consult
the frame_entry in OOPIF modes as well.

[clamy, 2016/05/11 08:54:41]

Added a TODO. I prefer this CL to stay focused on PlzNavigate (it's already
bulky enough like this).

+    method = frame_entry.method();
+  else
+    method = 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, GetHasPostData() ? "POST" : "GET");
+      navigation_start, method);
 }
 
 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());
@@ skipping 152 matching lines @@
       return node;
 
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content