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

net/disk_cache/mem_backend_impl.cc

 // 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.
 
 #include "net/disk_cache/mem_backend_impl.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/cache_util.h"
@@ skipping 118 matching lines @@
 }
 
 int MemBackendImpl::OpenEntry(const std::string& key, Entry** entry,
                               OldCompletionCallback* callback) {
   if (OpenEntry(key, entry))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::OpenEntry(const std::string& key, Entry** entry,
-                              const net::CompletionCallback& callback) {
-  if (OpenEntry(key, entry))
-    return net::OK;
-
-  return net::ERR_FAILED;
-}
-
 int MemBackendImpl::CreateEntry(const std::string& key, Entry** entry,
                                 OldCompletionCallback* callback) {
   if (CreateEntry(key, entry))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::CreateEntry(const std::string& key, Entry** entry,
-                                const net::CompletionCallback& callback) {
-  if (CreateEntry(key, entry))
-    return net::OK;
-
-  return net::ERR_FAILED;
-}
-
 int MemBackendImpl::DoomEntry(const std::string& key,
                               OldCompletionCallback* callback) {
   if (DoomEntry(key))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
 int MemBackendImpl::DoomAllEntries(OldCompletionCallback* callback) {
   if (DoomAllEntries())
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::DoomAllEntries(const net::CompletionCallback& callback) {
-  if (DoomAllEntries())
-    return net::OK;
-
-  return net::ERR_FAILED;
-}
-
 int MemBackendImpl::DoomEntriesBetween(const base::Time initial_time,
                                        const base::Time end_time,
                                        OldCompletionCallback* callback) {
   if (DoomEntriesBetween(initial_time, end_time))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::DoomEntriesBetween(
-    const base::Time initial_time, const base::Time end_time,
-    const net::CompletionCallback& callback) {
-  if (DoomEntriesBetween(initial_time, end_time))
-    return net::OK;
-
-  return net::ERR_FAILED;
-}
-
 int MemBackendImpl::DoomEntriesSince(const base::Time initial_time,
                                      OldCompletionCallback* callback) {
   if (DoomEntriesSince(initial_time))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
 int MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
                                   OldCompletionCallback* callback) {
   if (OpenNextEntry(iter, next_entry))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
-                                  const net::CompletionCallback& callback) {
-  if (OpenNextEntry(iter, next_entry))
-    return net::OK;
-
-  return net::ERR_FAILED;
-}
-
 void MemBackendImpl::EndEnumeration(void** iter) {
   *iter = NULL;
 }
 
 void MemBackendImpl::OnExternalCacheHit(const std::string& key) {
   EntryMap::iterator it = entries_.find(key);
   if (it != entries_.end()) {
     UpdateRank(it->second);
   }
 }
@@ skipping 121 matching lines @@
   if (current_size_ > max_size_)
     TrimCache(false);
 }
 
 void MemBackendImpl::SubstractStorageSize(int32 bytes) {
   current_size_ -= bytes;
   DCHECK_GE(current_size_, 0);
 }
 
 }  // namespace disk_cache