Reland r113261 rebased after revert of r113249.

net/http/mock_http_cache.h

Index: net/http/mock_http_cache.h
diff --git a/net/http/mock_http_cache.h b/net/http/mock_http_cache.h
index 975058f309e75a3284ec645356999d4136ee32d9..71aad887592e5c6a7074e8738614d87b823d1cfa 100644
--- a/net/http/mock_http_cache.h
+++ b/net/http/mock_http_cache.h
@@ -103,9 +103,14 @@ class MockDiskCache : public disk_cache::Backend {
   virtual int DoomEntry(const std::string& key,
                         net::OldCompletionCallback* callback) OVERRIDE;
   virtual int DoomAllEntries(net::OldCompletionCallback* callback) OVERRIDE;
+  virtual int DoomAllEntries(const net::CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntriesBetween(const base::Time initial_time,
                                  const base::Time end_time,
                                  net::OldCompletionCallback* callback) OVERRIDE;
+  virtual int DoomEntriesBetween(
+      const base::Time initial_time,
+      const base::Time end_time,
+      const net::CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntriesSince(const base::Time initial_time,
                                net::OldCompletionCallback* callback) OVERRIDE;
   virtual int OpenNextEntry(void** iter, disk_cache::Entry** next_entry,