ABANDONED CL: Using ResourceRequestBody as the type of browser_initiated_post_data.

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>
@@ skipping 401 matching lines @@
 }
 
 void NavigationEntryImpl::SetPostID(int64_t post_id) {
   frame_tree_->frame_entry->set_post_id(post_id);
 }
 
 int64_t NavigationEntryImpl::GetPostID() const {
   return frame_tree_->frame_entry->post_id();
 }
 
-void NavigationEntryImpl::SetBrowserInitiatedPostData(
-    const base::RefCountedMemory* data) {
-  browser_initiated_post_data_ = data;
+void NavigationEntryImpl::SetPostData(
+    const scoped_refptr<ResourceRequestBody>& data) {
+  post_data_ =
+      static_cast<ResourceRequestBodyImpl*>(data.get());
 }
 
-const base::RefCountedMemory*
-NavigationEntryImpl::GetBrowserInitiatedPostData() const {
-  return browser_initiated_post_data_.get();
+scoped_refptr<ResourceRequestBody> NavigationEntryImpl::GetPostData() const {
+  return post_data_.get();
 }
 
 
 const FaviconStatus& NavigationEntryImpl::GetFavicon() const {
   return favicon_;
 }
 
 FaviconStatus& NavigationEntryImpl::GetFavicon() {
   return favicon_;
 }
@@ skipping 103 matching lines @@
   copy->favicon_ = favicon_;
   copy->page_id_ = page_id_;
   copy->ssl_ = ssl_;
   copy->transition_type_ = transition_type_;
   copy->user_typed_url_ = user_typed_url_;
   copy->restore_type_ = restore_type_;
   copy->original_request_url_ = original_request_url_;
   copy->is_overriding_user_agent_ = is_overriding_user_agent_;
   copy->timestamp_ = timestamp_;
   copy->http_status_code_ = http_status_code_;
-  // ResetForCommit: browser_initiated_post_data_
+  // ResetForCommit: post_data_
   copy->screenshot_ = screenshot_;
   copy->extra_headers_ = extra_headers_;
   copy->base_url_for_data_url_ = base_url_for_data_url_;
 #if defined(OS_ANDROID)
   copy->data_url_as_string_ = data_url_as_string_;
 #endif
   // ResetForCommit: is_renderer_initiated_
   copy->cached_display_title_ = cached_display_title_;
   // ResetForCommit: transferred_global_request_id_
   // ResetForCommit: should_replace_entry_
   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;
 }
 
-scoped_refptr<ResourceRequestBodyImpl>
-NavigationEntryImpl::ConstructBodyFromBrowserInitiatedPostData() const {
-  scoped_refptr<ResourceRequestBodyImpl> browser_initiated_post_body;
-  if (GetHasPostData()) {
-    if (const base::RefCountedMemory* memory = GetBrowserInitiatedPostData()) {
-      browser_initiated_post_body = new ResourceRequestBodyImpl();
-      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<ResourceRequestBodyImpl>& post_body,
     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;
@@ skipping 11 matching lines @@
   if (IsBrowserSideNavigationEnabled())
     method = frame_entry.method();
   else
     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,
-      post_body ? post_body : ConstructBodyFromBrowserInitiatedPostData());
+      post_body ? post_body : post_data_);
 }
 
 StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
     const {
   return StartNavigationParams(extra_headers(),
 #if defined(OS_ANDROID)
                                has_user_gesture(),
 #endif
                                transferred_global_request_id().child_id,
                                transferred_global_request_id().request_id);
@@ skipping 48 matching lines @@
   }
 #endif
   return request_params;
 }
 
 void NavigationEntryImpl::ResetForCommit(FrameNavigationEntry* frame_entry) {
   // Any state that only matters when a navigation entry is pending should be
   // cleared here.
   // TODO(creis): This state should be moved to NavigationRequest once
   // PlzNavigate is enabled.
-  SetBrowserInitiatedPostData(nullptr);
+  SetPostData(nullptr);
   set_is_renderer_initiated(false);
   set_transferred_global_request_id(GlobalRequestID());
   set_should_replace_entry(false);
 
   set_should_clear_history_list(false);
   set_frame_tree_node_id(-1);
 
   if (frame_entry)
     frame_entry->set_source_site_instance(nullptr);
 
@@ skipping 80 matching lines @@
       return node;
 
     // Enqueue any children and keep looking.
     for (auto& child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content