Make WebURLLoader capable of retaining received buffers.

chrome/renderer/security_filter_peer.cc

 // Copyright (c) 2012 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 "chrome/renderer/security_filter_peer.h"
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/grit/generated_resources.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace {
+
+class StringData final : public content::RequestPeer::ReceivedData {
+ public:
+  explicit StringData(const std::string& data) : data_(data) {}
+
+  const char* payload() const override { return data_.data(); }
+  int length() const override { return data_.size(); }
+  int encoded_length() const override { return -1; }
+
+ private:
+  std::string data_;
+
+  DISALLOW_COPY_AND_ASSIGN(StringData);
+};
+
+}  // namespace
+
 SecurityFilterPeer::SecurityFilterPeer(content::RequestPeer* peer)
     : original_peer_(peer) {
 }
 
 SecurityFilterPeer::~SecurityFilterPeer() {
 }
 
 // static
 SecurityFilterPeer*
 SecurityFilterPeer::CreateSecurityFilterPeerForDeniedRequest(
@@ skipping 49 matching lines @@
     const content::ResourceResponseInfo& info) {
   NOTREACHED();
   return false;
 }
 
 void SecurityFilterPeer::OnReceivedResponse(
     const content::ResourceResponseInfo& info) {
   NOTREACHED();
 }
 
-void SecurityFilterPeer::OnReceivedData(const char* data,
-                                        int data_length,
-                                        int encoded_data_length) {
+void SecurityFilterPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
   NOTREACHED();
 }
 
 void SecurityFilterPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     const std::string& security_info,
     const base::TimeTicks& completion_time,
     int64 total_transfer_size) {
@@ skipping 36 matching lines @@
     : SecurityFilterPeer(peer), mime_type_(mime_type) {}
 
 BufferedPeer::~BufferedPeer() {
 }
 
 void BufferedPeer::OnReceivedResponse(
     const content::ResourceResponseInfo& info) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
-void BufferedPeer::OnReceivedData(const char* data,
-                                  int data_length,
-                                  int encoded_data_length) {
-  data_.append(data, data_length);
+void BufferedPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
+  data_.append(data->payload(), data->length());
 }
 
 void BufferedPeer::OnCompletedRequest(int error_code,
                                       bool was_ignored_by_handler,
                                       bool stale_copy_in_cache,
                                       const std::string& security_info,
                                       const base::TimeTicks& completion_time,
                                       int64 total_transfer_size) {
   // Make sure we delete ourselves at the end of this call.
   scoped_ptr<BufferedPeer> this_deleter(this);
 
   // Give sub-classes a chance at altering the data.
   if (error_code != net::OK || !DataReady()) {
     // Pretend we failed to load the resource.
     original_peer_->OnReceivedResponse(response_info_);
     original_peer_->OnCompletedRequest(net::ERR_ABORTED, false,
                                        stale_copy_in_cache,
                                        security_info, completion_time,
                                        total_transfer_size);
     return;
   }
 
   original_peer_->OnReceivedResponse(response_info_);
   if (!data_.empty())
-    original_peer_->OnReceivedData(data_.data(),
-                                   static_cast<int>(data_.size()),
-                                   -1);
+    original_peer_->OnReceivedData(make_scoped_ptr(new StringData(data_)));
   original_peer_->OnCompletedRequest(error_code, was_ignored_by_handler,
                                      stale_copy_in_cache, security_info,
                                      completion_time, total_transfer_size);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ReplaceContentPeer
 
 ReplaceContentPeer::ReplaceContentPeer(content::RequestPeer* peer,
                                        const std::string& mime_type,
                                        const std::string& data)
     : SecurityFilterPeer(peer),
       mime_type_(mime_type),
       data_(data) {}
 
 ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
     const content::ResourceResponseInfo& info) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
-void ReplaceContentPeer::OnReceivedData(const char* data,
-                                        int data_length,
-                                        int encoded_data_length) {
+void ReplaceContentPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     const std::string& security_info,
     const base::TimeTicks& completion_time,
     int64 total_transfer_size) {
   content::ResourceResponseInfo info;
   ProcessResponseInfo(info, &info, mime_type_);
   info.security_info = security_info;
   info.content_length = static_cast<int>(data_.size());
   original_peer_->OnReceivedResponse(info);
   if (!data_.empty())
-    original_peer_->OnReceivedData(data_.data(),
-                                   static_cast<int>(data_.size()),
-                                   -1);
+    original_peer_->OnReceivedData(make_scoped_ptr(new StringData(data_)));
   original_peer_->OnCompletedRequest(net::OK,
                                      false,
                                      stale_copy_in_cache,
                                      security_info,
                                      completion_time,
                                      total_transfer_size);
 
   // The request processing is complete, we must delete ourselves.
   delete this;
 }