1 files changed, 5 insertions, 32 deletions

diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index 7d8832e..f501764 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -145,7 +145,7 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
   }
 
   PluginRequestHandler(ChromePluginLib* plugin, ScopableCPRequest* cprequest)
-      : PluginHelper(plugin), cprequest_(cprequest), user_buffer_(NULL) {
+      : PluginHelper(plugin), cprequest_(cprequest) {
     cprequest_->data = this;  // see FromCPRequest().
 
     URLRequestContext* context = CPBrowsingContextManager::Instance()->
@@ -163,25 +163,6 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
 
   URLRequest* request() { return request_.get(); }
 
-  // Wraper of URLRequest::Read()
-  bool Read(char* dest, int dest_size, int *bytes_read) {
-    CHECK(!my_buffer_.get());
-    // We'll use our own buffer until the read actually completes.
-    user_buffer_ = dest;
-    my_buffer_ = new net::IOBuffer(dest_size);
-
-    if (request_->Read(my_buffer_, dest_size, bytes_read)) {
-      memcpy(dest, my_buffer_->data(), *bytes_read);
-      my_buffer_ = NULL;
-      return true;
-    }
-
-    if (!request_->status().is_io_pending())
-      my_buffer_ = NULL;
-
-    return false;
-  }
-
   // URLRequest::Delegate
   virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url) {
     plugin_->functions().response_funcs->received_redirect(
@@ -197,24 +178,16 @@ class PluginRequestHandler : public PluginHelper, public URLRequest::Delegate {
   }
 
   virtual void OnReadCompleted(URLRequest* request, int bytes_read) {
-    CHECK(my_buffer_.get());
-    CHECK(user_buffer_);
-    if (bytes_read > 0) {
-      memcpy(user_buffer_, my_buffer_->data(), bytes_read);
-    } else if (bytes_read < 0) {
-      // TODO(mpcomplete): better error codes
+    // TODO(mpcomplete): better error codes
+    if (bytes_read < 0)
       bytes_read = CPERR_FAILURE;
-    }
-    my_buffer_ = NULL;
     plugin_->functions().response_funcs->read_completed(
-        cprequest_.get(), bytes_read);
+      cprequest_.get(), bytes_read);
   }
 
  private:
   scoped_ptr<ScopableCPRequest> cprequest_;
   scoped_ptr<URLRequest> request_;
-  scoped_refptr<net::IOBuffer> my_buffer_;
-  char* user_buffer_;
 };
 
 // This class manages plugins that want to handle UI commands.  Right now, we
@@ -641,7 +614,7 @@ int STDCALL CPR_Read(CPRequest* request, void* buf, uint32 buf_size) {
   CHECK(handler);
 
   int bytes_read;
-  if (handler->Read(static_cast<char*>(buf), buf_size, &bytes_read))
+  if (handler->request()->Read(static_cast<char*>(buf), buf_size, &bytes_read))
     return bytes_read;  // 0 == CPERR_SUCESS
 
   if (handler->request()->status().is_io_pending())