Revert of Reland of "Remove void** from disk_cache interface."

net/disk_cache/memory/mem_backend_impl.h

Index: net/disk_cache/memory/mem_backend_impl.h
diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h
index 10946c51f7a788e75bdac13b986f01015b6d073c..5f31be54da9e4abb29087e91669316fa2b4f1241 100644
--- a/net/disk_cache/memory/mem_backend_impl.h
+++ b/net/disk_cache/memory/mem_backend_impl.h
@@ -9,7 +9,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
-#include "base/memory/weak_ptr.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/disk_cache/memory/mem_rankings.h"
 
@@ -77,15 +76,14 @@
                                  const CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntriesSince(base::Time initial_time,
                                const CompletionCallback& callback) OVERRIDE;
-  virtual scoped_ptr<Iterator> CreateIterator() OVERRIDE;
+  virtual int OpenNextEntry(void** iter, Entry** next_entry,
+                            const CompletionCallback& callback) OVERRIDE;
+  virtual void EndEnumeration(void** iter) OVERRIDE;
   virtual void GetStats(
       std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE {}
   virtual void OnExternalCacheHit(const std::string& key) OVERRIDE;
 
  private:
-  class MemIterator;
-  friend class MemIterator;
-
   typedef base::hash_map<std::string, MemEntryImpl*> EntryMap;
 
   // Old Backend interface.
@@ -96,6 +94,7 @@
   bool DoomEntriesBetween(const base::Time initial_time,
                           const base::Time end_time);
   bool DoomEntriesSince(const base::Time initial_time);
+  bool OpenNextEntry(void** iter, Entry** next_entry);
 
   // Deletes entries from the cache until the current size is below the limit.
   // If empty is true, the whole cache will be trimmed, regardless of being in
@@ -113,8 +112,6 @@
 
   net::NetLog* net_log_;
 
-  base::WeakPtrFactory<MemBackendImpl> weak_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(MemBackendImpl);
 };