Revert 227318 "Clean up ResourceHandler API."

trunk/src/content/browser/loader/resource_loader.cc

Index: trunk/src/content/browser/loader/resource_loader.cc
===================================================================
--- trunk/src/content/browser/loader/resource_loader.cc	(revision 227593)
+++ trunk/src/content/browser/loader/resource_loader.cc	(working copy)
@@ -597,10 +597,7 @@
   ResourceRequestInfoImpl* info = GetRequestInfo();
   DCHECK(!is_deferred());
 
-  // Make sure we track the buffer in at least one place.  This ensures it gets
-  // deleted even in the case the request has already finished its job and
-  // doesn't use the buffer.
-  scoped_refptr<net::IOBuffer> buf;
+  net::IOBuffer* buf;
   int buf_size;
   if (!handler_->OnWillRead(info->GetRequestID(), &buf, &buf_size, -1)) {
     Cancel();
@@ -610,8 +607,13 @@
   DCHECK(buf);
   DCHECK(buf_size > 0);
 
-  request_->Read(buf.get(), buf_size, bytes_read);
+  // Make sure we track the buffer in at least one place.  This ensures it gets
+  // deleted even in the case the request has already finished its job and
+  // doesn't use the buffer.
+  scoped_refptr<net::IOBuffer> tracked_buf(buf);
 
+  request_->Read(tracked_buf.get(), buf_size, bytes_read);
+
   // No need to check the return value here as we'll detect errors by
   // inspecting the URLRequest's status.
 }