Revert of Make WebURLLoader capable of retaining received buffers.

chrome/renderer/security_filter_peer.cc

Index: chrome/renderer/security_filter_peer.cc
diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc
index 9be2fb08c2a2b492f75940e8703f3d1f9efe832a..e43e7ec7edc687cc82ca6d68c26329c562802faa 100644
--- a/chrome/renderer/security_filter_peer.cc
+++ b/chrome/renderer/security_filter_peer.cc
@@ -4,12 +4,9 @@
 
 #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 "content/public/child/fixed_received_data.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -83,7 +80,9 @@
   NOTREACHED();
 }
 
-void SecurityFilterPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
+void SecurityFilterPeer::OnReceivedData(const char* data,
+                                        int data_length,
+                                        int encoded_data_length) {
   NOTREACHED();
 }
 
@@ -140,8 +139,10 @@
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
-void BufferedPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
-  data_.append(data->payload(), data->length());
+void BufferedPeer::OnReceivedData(const char* data,
+                                  int data_length,
+                                  int encoded_data_length) {
+  data_.append(data, data_length);
 }
 
 void BufferedPeer::OnCompletedRequest(int error_code,
@@ -166,8 +167,9 @@
 
   original_peer_->OnReceivedResponse(response_info_);
   if (!data_.empty())
-    original_peer_->OnReceivedData(make_scoped_ptr(
-        new content::FixedReceivedData(data_.data(), data_.size(), -1)));
+    original_peer_->OnReceivedData(data_.data(),
+                                   static_cast<int>(data_.size()),
+                                   -1);
   original_peer_->OnCompletedRequest(error_code, was_ignored_by_handler,
                                      stale_copy_in_cache, security_info,
                                      completion_time, total_transfer_size);
@@ -191,7 +193,9 @@
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
-void ReplaceContentPeer::OnReceivedData(scoped_ptr<ReceivedData> data) {
+void ReplaceContentPeer::OnReceivedData(const char* data,
+                                        int data_length,
+                                        int encoded_data_length) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
@@ -208,8 +212,9 @@
   info.content_length = static_cast<int>(data_.size());
   original_peer_->OnReceivedResponse(info);
   if (!data_.empty())
-    original_peer_->OnReceivedData(make_scoped_ptr(
-        new content::FixedReceivedData(data_.data(), data_.size(), -1)));
+    original_peer_->OnReceivedData(data_.data(),
+                                   static_cast<int>(data_.size()),
+                                   -1);
   original_peer_->OnCompletedRequest(net::OK,
                                      false,
                                      stale_copy_in_cache,