1 files changed, 15 insertions, 18 deletions

diff --git a/net/disk_cache/in_flight_backend_io.h b/net/disk_cache/in_flight_backend_io.h
index c3a52d5..a23c955 100644
--- a/net/disk_cache/in_flight_backend_io.h
+++ b/net/disk_cache/in_flight_backend_io.h
@@ -26,8 +26,6 @@ class EntryImpl;
 class BackendIO : public BackgroundIO {
  public:
   BackendIO(InFlightIO* controller, BackendImpl* backend,
-            net::OldCompletionCallback* callback);
-  BackendIO(InFlightIO* controller, BackendImpl* backend,
             const net::CompletionCallback& callback);
 
   // Runs the actual operation on the background thread.
@@ -39,7 +37,6 @@ class BackendIO : public BackgroundIO {
   // Returns true if this operation is directed to an entry (vs. the backend).
   bool IsEntryOperation();
 
-  net::OldCompletionCallback* old_callback() const { return old_callback_; }
   net::CompletionCallback callback() const { return callback_; }
 
   // Grabs an extra reference of entry_.
@@ -116,10 +113,8 @@ class BackendIO : public BackgroundIO {
   void ExecuteEntryOperation();
 
   BackendImpl* backend_;
-  net::OldCompletionCallback* old_callback_;
   net::CompletionCallback callback_;
   Operation operation_;
-  net::OldCompletionCallbackImpl<BackendIO> my_callback_;
 
   // The arguments of all the operations we proxy:
   std::string key_;
@@ -152,9 +147,9 @@ class InFlightBackendIO : public InFlightIO {
   // Proxied operations.
   void Init(const net::CompletionCallback& callback);
   void OpenEntry(const std::string& key, Entry** entry,
-                 net::OldCompletionCallback* callback);
+                 const net::CompletionCallback& callback);
   void CreateEntry(const std::string& key, Entry** entry,
-                   net::OldCompletionCallback* callback);
+                   const net::CompletionCallback& callback);
   void DoomEntry(const std::string& key,
                  const net::CompletionCallback& callback);
   void DoomAllEntries(const net::CompletionCallback& callback);
@@ -162,29 +157,31 @@ class InFlightBackendIO : public InFlightIO {
                           const base::Time end_time,
                           const net::CompletionCallback& callback);
   void DoomEntriesSince(const base::Time initial_time,
-                        net::OldCompletionCallback* callback);
+                        const net::CompletionCallback& callback);
   void OpenNextEntry(void** iter, Entry** next_entry,
                      const net::CompletionCallback& callback);
   void OpenPrevEntry(void** iter, Entry** prev_entry,
-                     net::OldCompletionCallback* callback);
+                     const net::CompletionCallback& callback);
   void EndEnumeration(void* iterator);
   void OnExternalCacheHit(const std::string& key);
   void CloseEntryImpl(EntryImpl* entry);
   void DoomEntryImpl(EntryImpl* entry);
-  void FlushQueue(net::OldCompletionCallback* callback);
-  void RunTask(Task* task, net::OldCompletionCallback* callback);
+  void FlushQueue(const net::CompletionCallback& callback);
+  void RunTask(Task* task, const net::CompletionCallback& callback);
   void ReadData(EntryImpl* entry, int index, int offset, net::IOBuffer* buf,
-                int buf_len, net::OldCompletionCallback* callback);
-  void WriteData(EntryImpl* entry, int index, int offset, net::IOBuffer* buf,
-                 int buf_len, bool truncate, net::OldCompletionCallback* callback);
+                int buf_len, const net::CompletionCallback& callback);
+  void WriteData(
+      EntryImpl* entry, int index, int offset, net::IOBuffer* buf,
+      int buf_len, bool truncate, const net::CompletionCallback& callback);
   void ReadSparseData(EntryImpl* entry, int64 offset, net::IOBuffer* buf,
-                      int buf_len, net::OldCompletionCallback* callback);
+                      int buf_len, const net::CompletionCallback& callback);
   void WriteSparseData(EntryImpl* entry, int64 offset, net::IOBuffer* buf,
-                       int buf_len, net::OldCompletionCallback* callback);
+                       int buf_len, const net::CompletionCallback& callback);
   void GetAvailableRange(EntryImpl* entry, int64 offset, int len, int64* start,
-                         net::OldCompletionCallback* callback);
+                         const net::CompletionCallback& callback);
   void CancelSparseIO(EntryImpl* entry);
-  void ReadyForSparseIO(EntryImpl* entry, net::OldCompletionCallback* callback);
+  void ReadyForSparseIO(EntryImpl* entry,
+                        const net::CompletionCallback& callback);
 
   // Blocks until all operations are cancelled or completed.
   void WaitForPendingIO();