Reverts a commit that caused ASAN failures, and 2 dependent commits.

net/disk_cache/entry_impl.h

 // Copyright (c) 2011 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_DISK_CACHE_ENTRY_IMPL_H_
 #define NET_DISK_CACHE_ENTRY_IMPL_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_log.h"
@@ skipping 23 matching lines @@
     kReadAsync1,
     kWriteAsync1
   };
 
   EntryImpl(BackendImpl* backend, Addr address, bool read_only);
 
   // Background implementation of the Entry interface.
   void DoomImpl();
   int ReadDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len,
                    OldCompletionCallback* callback);
-  int ReadDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback);
   int WriteDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len,
                     OldCompletionCallback* callback, bool truncate);
-  int WriteDataImpl(int index, int offset, net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback, bool truncate);
   int ReadSparseDataImpl(int64 offset, net::IOBuffer* buf, int buf_len,
                          OldCompletionCallback* callback);
   int WriteSparseDataImpl(int64 offset, net::IOBuffer* buf, int buf_len,
                           OldCompletionCallback* callback);
   int GetAvailableRangeImpl(int64 offset, int len, int64* start);
   void CancelSparseIOImpl();
   int ReadyForSparseIOImpl(OldCompletionCallback* callback);
 
   inline CacheEntryBlock* entry() {
     return &entry_;
@@ skipping 86 matching lines @@
   // Entry interface.
   virtual void Doom() OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual std::string GetKey() const OVERRIDE;
   virtual base::Time GetLastUsed() const OVERRIDE;
   virtual base::Time GetLastModified() const OVERRIDE;
   virtual int32 GetDataSize(int index) const OVERRIDE;
   virtual int ReadData(
       int index, int offset, net::IOBuffer* buf, int buf_len,
       net::OldCompletionCallback* completion_callback) OVERRIDE;
-  virtual int ReadData(
-      int index, int offset, net::IOBuffer* buf, int buf_len,
-      const net::CompletionCallback& completion_callback) OVERRIDE;
   virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
                         net::OldCompletionCallback* completion_callback,
                         bool truncate) OVERRIDE;
-  virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
-                        const net::CompletionCallback& completion_callback,
-                        bool truncate) OVERRIDE;
   virtual int ReadSparseData(
       int64 offset, net::IOBuffer* buf, int buf_len,
       net::OldCompletionCallback* completion_callback) OVERRIDE;
   virtual int WriteSparseData(
       int64 offset, net::IOBuffer* buf, int buf_len,
       net::OldCompletionCallback* completion_callback) OVERRIDE;
   virtual int GetAvailableRange(int64 offset, int len, int64* start,
                                 OldCompletionCallback* callback) OVERRIDE;
   virtual bool CouldBeSparse() const OVERRIDE;
   virtual void CancelSparseIO() OVERRIDE;
   virtual int ReadyForSparseIO(
       net::OldCompletionCallback* completion_callback) OVERRIDE;
 
  private:
   enum {
      kNumStreams = 3
   };
   class UserBuffer;
 
   virtual ~EntryImpl();
 
   // Do all the work for ReadDataImpl and WriteDataImpl.  Implemented as
   // separate functions to make logging of results simpler.
   int InternalReadData(int index, int offset, net::IOBuffer* buf,
                        int buf_len, OldCompletionCallback* callback);
-  int InternalReadData(int index, int offset, net::IOBuffer* buf,
-                       int buf_len, const net::CompletionCallback& callback);
   int InternalWriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
                         OldCompletionCallback* callback, bool truncate);
-  int InternalWriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
-                        const net::CompletionCallback& callback, bool truncate);
 
   // Initializes the storage for an internal or external data block.
   bool CreateDataBlock(int index, int size);
 
   // Initializes the storage for an internal or external generic block.
   bool CreateBlock(int size, Addr* address);
 
   // Deletes the data pointed by address, maybe backed by files_[index].
   // Note that most likely the caller should delete (and store) the reference to
   // |address| *before* calling this method because we don't want to have an
@@ skipping 73 matching lines @@
   scoped_ptr<SparseControl> sparse_;  // Support for sparse entries.
 
   net::BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(EntryImpl);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_ENTRY_IMPL_H_