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

net/disk_cache/blockfile/backend_impl_v3.h

 // Copyright (c) 2012 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.
 
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
 #ifndef NET_DISK_CACHE_BLOCKFILE_BACKEND_IMPL_V3_H_
 #define NET_DISK_CACHE_BLOCKFILE_BACKEND_IMPL_V3_H_
 
 #include "base/containers/hash_tables.h"
@@ skipping 168 matching lines @@
   virtual int CreateEntry(const std::string& key, Entry** entry,
                           const CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntry(const std::string& key,
                         const CompletionCallback& callback) OVERRIDE;
   virtual int DoomAllEntries(const CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntriesBetween(base::Time initial_time,
                                  base::Time end_time,
                                  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(StatsItems* stats) OVERRIDE;
   virtual void OnExternalCacheHit(const std::string& key) OVERRIDE;
 
  private:
   friend class EvictionV3;
   typedef base::hash_map<CacheAddr, EntryImplV3*> EntriesMap;
-  class IteratorImpl;
-  class NotImplementedIterator;
   class Worker;
 
   void AdjustMaxCacheSize();
   bool InitStats(void* stats_data);
   void StoreStats();
 
   // Deletes the cache and starts again.
   void RestartCache(bool failure);
   void PrepareForRestart();
 
@@ skipping 64 matching lines @@
   scoped_ptr<base::RepeatingTimer<BackendImplV3> > timer_;  // Usage timer.
   scoped_refptr<TraceObject> trace_object_;  // Initializes internal tracing.
   base::WeakPtrFactory<BackendImplV3> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BackendImplV3);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_BLOCKFILE_BACKEND_IMPL_V3_H_