Revert cl 9528 to fix mac test_shell_tests

net/base/completion_callback.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef NET_BASE_COMPLETION_CALLBACK_H__
 #define NET_BASE_COMPLETION_CALLBACK_H__
 
 #include "base/task.h"
+#include "net/base/io_buffer.h"
 
 namespace net {
 
 // A callback specialization that takes a single int parameter.  Usually this
 // is used to report a byte count or network error code.
 typedef Callback1<int>::Type CompletionCallback;
 
 // Used to implement a CompletionCallback.
 template <class T>
 class CompletionCallbackImpl :
@@ skipping 15 matching lines @@
     public base::RefCounted<CancelableCompletionCallback<T> > {
  public:
   CancelableCompletionCallback(T* obj, void (T::* meth)(int))
     : CompletionCallbackImpl<T>(obj, meth), is_canceled_(false) {
   }
 
   void Cancel() {
     is_canceled_ = true;
   }
 
+  // Attaches the given buffer to this callback so it is valid until the
+  // operation completes. TODO(rvargas): This is a temporal fix for bug 5325
+  // while I send IOBuffer to the lower layers of code.
+  void UseBuffer(net::IOBuffer* buffer) {
+    DCHECK(!buffer_.get());
+    buffer_ = buffer;
+  }
+
+  // The callback is not expected anymore so release the buffer.
+  void ReleaseBuffer() {
+    DCHECK(buffer_.get());
+    buffer_ = NULL;
+  }
+
   virtual void RunWithParams(const Tuple1<int>& params) {
     if (is_canceled_) {
+      CancelableCompletionCallback<T>::ReleaseBuffer();
       base::RefCounted<CancelableCompletionCallback<T> >::Release();
     } else {
       CompletionCallbackImpl<T>::RunWithParams(params);
     }
   }
 
  private:
+  scoped_refptr<net::IOBuffer> buffer_;
   bool is_canceled_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_COMPLETION_CALLBACK_H__