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

net/disk_cache/mem_backend_impl.cc

Index: net/disk_cache/mem_backend_impl.cc
diff --git a/net/disk_cache/mem_backend_impl.cc b/net/disk_cache/mem_backend_impl.cc
index 8cdf0ac21b99e2352b190aaf184eca0f87c0dade..f08b316465010e377740da26234ea444e08c3110 100644
--- a/net/disk_cache/mem_backend_impl.cc
+++ b/net/disk_cache/mem_backend_impl.cc
@@ -136,14 +136,6 @@ int MemBackendImpl::OpenEntry(const std::string& key, Entry** entry,
   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))
@@ -152,14 +144,6 @@ int MemBackendImpl::CreateEntry(const std::string& key, Entry** entry,
   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))
@@ -175,13 +159,6 @@ int MemBackendImpl::DoomAllEntries(OldCompletionCallback* callback) {
   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) {
@@ -191,15 +168,6 @@ int MemBackendImpl::DoomEntriesBetween(const base::Time initial_time,
   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))
@@ -216,14 +184,6 @@ int MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
   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;
 }