Remove void** from disk_cache interface.

net/disk_cache/simple/simple_backend_impl.cc

 // Copyright (c) 2013 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.
 
 #include "net/disk_cache/simple/simple_backend_impl.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <functional>
 
@@ skipping 455 matching lines @@
       base::Bind(&SimpleBackendImpl::IndexReadyForDoom, AsWeakPtr(),
                  initial_time, end_time, callback));
 }
 
 int SimpleBackendImpl::DoomEntriesSince(
     const Time initial_time,
     const CompletionCallback& callback) {
   return DoomEntriesBetween(initial_time, Time(), callback);
 }
 
-int SimpleBackendImpl::OpenNextEntry(void** iter,
+int SimpleBackendImpl::OpenNextEntry(Iterator* iter,
                                      Entry** next_entry,
                                      const CompletionCallback& callback) {
-  CompletionCallback get_next_entry =
-      base::Bind(&SimpleBackendImpl::GetNextEntryInIterator, AsWeakPtr(), iter,
+  CompletionCallback open_next_entry_impl =
+      base::Bind(&SimpleBackendImpl::OpenNextEntryImpl, AsWeakPtr(), iter,
                  next_entry, callback);
-  return index_->ExecuteWhenReady(get_next_entry);
-}
-
-void SimpleBackendImpl::EndEnumeration(void** iter) {
-  SimpleIndex::HashList* entry_list =
-      static_cast<SimpleIndex::HashList*>(*iter);
-  delete entry_list;
-  *iter = NULL;
+  return index_->ExecuteWhenReady(open_next_entry_impl);
 }
 
 void SimpleBackendImpl::GetStats(
     std::vector<std::pair<std::string, std::string> >* stats) {
   std::pair<std::string, std::string> item;
   item.first = "Cache type";
   item.second = "Simple Cache";
   stats->push_back(item);
 }
 
@@ skipping 107 matching lines @@
     return active_it->second->DoomEntry(callback);
 
   // There's no pending dooms, nor any open entry. We can make a trivial
   // call to DoomEntries() to delete this entry.
   std::vector<uint64> entry_hash_vector;
   entry_hash_vector.push_back(entry_hash);
   DoomEntries(&entry_hash_vector, callback);
   return net::ERR_IO_PENDING;
 }
 
-void SimpleBackendImpl::GetNextEntryInIterator(
-    void** iter,
-    Entry** next_entry,
-    const CompletionCallback& callback,
-    int error_code) {
-  if (error_code != net::OK) {
-    callback.Run(error_code);
+void SimpleBackendImpl::OpenNextEntryImpl(Iterator* iter,
+                                          Entry** next_entry,
+                                          const CompletionCallback& callback,
+                                          int index_initialization_error_code) {
+  if (index_initialization_error_code != net::OK) {
+    callback.Run(index_initialization_error_code);
     return;
   }
-  if (*iter == NULL) {
-    *iter = index()->GetAllHashes().release();
-  }
-  SimpleIndex::HashList* entry_list =
-      static_cast<SimpleIndex::HashList*>(*iter);
-  while (entry_list->size() > 0) {
-    uint64 entry_hash = entry_list->back();
-    entry_list->pop_back();
+
+  class State : public EnumerationState {
+   public:
+    explicit State(scoped_ptr<std::vector<uint64> > hashes_to_enumerate) {
+      hashes_to_enumerate_.swap(*hashes_to_enumerate);
+    }
+    virtual ~State() {}
+
+    std::vector<uint64>& hashes_to_enumerate() { return hashes_to_enumerate_; }
+
+   private:
+    std::vector<uint64>  hashes_to_enumerate_;
+  };
+
+  if (!*iter)
+    iter->reset(new State(index()->GetAllHashes().Pass()));
+  State* state = static_cast<State*>(iter->get());
+
+  while (!state->hashes_to_enumerate().empty()) {
+    uint64 entry_hash = state->hashes_to_enumerate().back();
+    state->hashes_to_enumerate().pop_back();
     if (index()->Has(entry_hash)) {
       *next_entry = NULL;
       CompletionCallback continue_iteration = base::Bind(
           &SimpleBackendImpl::CheckIterationReturnValue,
           AsWeakPtr(),
           iter,
           next_entry,
           callback);
       int error_code_open = OpenEntryFromHash(entry_hash,
                                               next_entry,
@@ skipping 56 matching lines @@
       final_code = net::ERR_FAILED;
     } else {
       DCHECK_EQ(simple_entry->entry_hash(), simple_util::GetEntryHashKey(key));
     }
     SIMPLE_CACHE_UMA(BOOLEAN, "KeyMatchedOnOpen", cache_type_, key_matches);
   }
   callback.Run(final_code);
 }
 
 void SimpleBackendImpl::CheckIterationReturnValue(
-    void** iter,
+    Iterator* iter,
     Entry** entry,
     const CompletionCallback& callback,
     int error_code) {
   if (error_code == net::ERR_FAILED) {
     OpenNextEntry(iter, entry, callback);
     return;
   }
   callback.Run(error_code);
 }
 
 void SimpleBackendImpl::DoomEntriesComplete(
     scoped_ptr<std::vector<uint64> > entry_hashes,
     const net::CompletionCallback& callback,
     int result) {
   std::for_each(
       entry_hashes->begin(), entry_hashes->end(),
       std::bind1st(std::mem_fun(&SimpleBackendImpl::OnDoomComplete),
                    this));
   callback.Run(result);
 }
 
 void SimpleBackendImpl::FlushWorkerPoolForTesting() {
   if (g_sequenced_worker_pool)
     g_sequenced_worker_pool->FlushForTesting();
 }
 
 }  // namespace disk_cache