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

net/disk_cache/backend_impl.cc

Index: net/disk_cache/backend_impl.cc
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc
index d452f22234082a9230a76201c6becc1cec24de61..14a27228624c6668ba7670cb0f416de342459521 100644
--- a/net/disk_cache/backend_impl.cc
+++ b/net/disk_cache/backend_impl.cc
@@ -1381,13 +1381,6 @@ int BackendImpl::OpenEntry(const std::string& key, Entry** entry,
   return net::ERR_IO_PENDING;
 }
 
-int BackendImpl::OpenEntry(const std::string& key, Entry** entry,
-                           const net::CompletionCallback& callback) {
-  DCHECK(!callback.is_null());
-  background_queue_.OpenEntry(key, entry, callback);
-  return net::ERR_IO_PENDING;
-}
-
 int BackendImpl::CreateEntry(const std::string& key, Entry** entry,
                              OldCompletionCallback* callback) {
   DCHECK(callback);
@@ -1395,13 +1388,6 @@ int BackendImpl::CreateEntry(const std::string& key, Entry** entry,
   return net::ERR_IO_PENDING;
 }
 
-int BackendImpl::CreateEntry(const std::string& key, Entry** entry,
-                             const net::CompletionCallback& callback) {
-  DCHECK(!callback.is_null());
-  background_queue_.CreateEntry(key, entry, callback);
-  return net::ERR_IO_PENDING;
-}
-
 int BackendImpl::DoomEntry(const std::string& key,
                            OldCompletionCallback* callback) {
   DCHECK(callback);
@@ -1415,12 +1401,6 @@ int BackendImpl::DoomAllEntries(OldCompletionCallback* callback) {
   return net::ERR_IO_PENDING;
 }
 
-int BackendImpl::DoomAllEntries(const net::CompletionCallback& callback) {
-  DCHECK(!callback.is_null());
-  background_queue_.DoomAllEntries(callback);
-  return net::ERR_IO_PENDING;
-}
-
 int BackendImpl::DoomEntriesBetween(const base::Time initial_time,
                                     const base::Time end_time,
                                     OldCompletionCallback* callback) {
@@ -1429,14 +1409,6 @@ int BackendImpl::DoomEntriesBetween(const base::Time initial_time,
   return net::ERR_IO_PENDING;
 }
 
-int BackendImpl::DoomEntriesBetween(const base::Time initial_time,
-                                    const base::Time end_time,
-                                    const net::CompletionCallback& callback) {
-  DCHECK(!callback.is_null());
-  background_queue_.DoomEntriesBetween(initial_time, end_time, callback);
-  return net::ERR_IO_PENDING;
-}
-
 int BackendImpl::DoomEntriesSince(const base::Time initial_time,
                                   OldCompletionCallback* callback) {
   DCHECK(callback);
@@ -1451,13 +1423,6 @@ int BackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
   return net::ERR_IO_PENDING;
 }
 
-int BackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
-                               const net::CompletionCallback& callback) {
-  DCHECK(!callback.is_null());
-  background_queue_.OpenNextEntry(iter, next_entry, callback);
-  return net::ERR_IO_PENDING;
-}
-
 void BackendImpl::EndEnumeration(void** iter) {
   background_queue_.EndEnumeration(*iter);
   *iter = NULL;