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

net/disk_cache/mem_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_MEM_ENTRY_IMPL_H_
 #define NET_DISK_CACHE_MEM_ENTRY_IMPL_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 83 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 {}
@@ skipping 68 matching lines @@
   bool doomed_;               // True if this entry was removed from the cache.
 
   net::BoundNetLog net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(MemEntryImpl);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_MEM_ENTRY_IMPL_H_