Revert 227318 "Clean up ResourceHandler API."

Could be causing http://crbug.com/305333.

> Clean up ResourceHandler API.
> 
> 1. Move URLRequest member to ResourceHandler base class and add convenience functions for subclasses.
> 2. Make OnWillRead take a scoped_refptr to avoid leaking the buffer.
> 
> BUG=295239
> TEST=No behavior change.
> 
> Review URL: https://codereview.chromium.org/25536005

TBR=creis@chromium.org

Review URL: https://codereview.chromium.org/26472004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227594 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 15 deletions

diff --git a/content/browser/loader/resource_handler.h b/content/browser/loader/resource_handler.h
index 8ec4117..de8bd9d 100644
--- a/content/browser/loader/resource_handler.h
+++ b/content/browser/loader/resource_handler.h
@@ -14,7 +14,6 @@
 
 #include <string>
 
-#include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
@@ -23,14 +22,11 @@ class GURL;
 
 namespace net {
 class IOBuffer;
-class URLRequest;
 class URLRequestStatus;
 }  // namespace net
 
 namespace content {
 class ResourceController;
-class ResourceMessageFilter;
-class ResourceRequestInfoImpl;
 struct ResourceResponse;
 
 // The resource dispatcher host uses this interface to process network events
@@ -81,7 +77,7 @@ class CONTENT_EXPORT ResourceHandler
   // If the handler returns false, then the request is cancelled.  Otherwise,
   // once data is available, OnReadCompleted will be called.
   virtual bool OnWillRead(int request_id,
-                          scoped_refptr<net::IOBuffer>* buf,
+                          net::IOBuffer** buf,
                           int* buf_size,
                           int min_size) = 0;
 
@@ -106,19 +102,11 @@ class CONTENT_EXPORT ResourceHandler
   virtual void OnDataDownloaded(int request_id, int bytes_downloaded) = 0;
 
  protected:
-  ResourceHandler(net::URLRequest* request);
-
-  ResourceController* controller() const { return controller_; }
-  net::URLRequest* request() const { return request_; }
-
-  // Convenience functions.
-  ResourceRequestInfoImpl* GetRequestInfo() const;
-  int GetRequestID() const;
-  ResourceMessageFilter* GetFilter() const;
+  ResourceHandler() : controller_(NULL) {}
+  ResourceController* controller() { return controller_; }
 
  private:
   ResourceController* controller_;
-  net::URLRequest* request_;
 };
 
 }  // namespace content