Remove void** from disk_cache interface.

net/disk_cache/memory/mem_backend_impl.cc

 // 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.
 
 #include "net/disk_cache/memory/mem_backend_impl.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/cache_util.h"
@@ skipping 162 matching lines @@
 }
 
 int MemBackendImpl::DoomEntriesSince(const base::Time initial_time,
                                      const CompletionCallback& callback) {
   if (DoomEntriesSince(initial_time))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-int MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry,
+int MemBackendImpl::OpenNextEntry(Iterator* iter, Entry** next_entry,
                                   const CompletionCallback& callback) {
   if (OpenNextEntry(iter, next_entry))
     return net::OK;
 
   return net::ERR_FAILED;
 }
 
-void MemBackendImpl::EndEnumeration(void** iter) {
-  *iter = NULL;
-}
-
 void MemBackendImpl::OnExternalCacheHit(const std::string& key) {
   EntryMap::iterator it = entries_.find(key);
   if (it != entries_.end()) {
     UpdateRank(it->second);
   }
 }
 
 bool MemBackendImpl::OpenEntry(const std::string& key, Entry** entry) {
   EntryMap::iterator it = entries_.find(key);
   if (it == entries_.end())
@@ skipping 75 matching lines @@
     // Get the entry in the front.
     Entry* entry = rankings_.GetNext(NULL);
 
     // Break the loop when there are no more entries or the entry is too old.
     if (!entry || entry->GetLastUsed() < initial_time)
       return true;
     entry->Doom();
   }
 }
 
-bool MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry) {
-  MemEntryImpl* current = reinterpret_cast<MemEntryImpl*>(*iter);
-  MemEntryImpl* node = rankings_.GetNext(current);
+bool MemBackendImpl::OpenNextEntry(Iterator* iter, Entry** next_entry) {
+  class State : public EnumerationState {
+   public:
+    State() : current_(NULL) {}
+
+    MemEntryImpl* current() { return current_; }
+    void set_current(MemEntryImpl* current) { current_ = current; }
+
+   private:
+    MemEntryImpl* current_;
+  };
+  if (!*iter)
+    iter->reset(new State());
+  State* state = static_cast<State*>(iter->get());
+
+  MemEntryImpl* node = rankings_.GetNext(state->current());
   // We should never return a child entry so iterate until we hit a parent
   // entry.
   while (node && node->type() != MemEntryImpl::kParentEntry) {
     node = rankings_.GetNext(node);
   }
   *next_entry = node;
-  *iter = node;
+  state->set_current(node);
 
   if (node)
     node->Open();
 
   return NULL != node;
 }
 
 void MemBackendImpl::TrimCache(bool empty) {
   MemEntryImpl* next = rankings_.GetPrev(NULL);
   if (!next)
@@ skipping 18 matching lines @@
   if (current_size_ > max_size_)
     TrimCache(false);
 }
 
 void MemBackendImpl::SubstractStorageSize(int32 bytes) {
   current_size_ -= bytes;
   DCHECK_GE(current_size_, 0);
 }
 
 }  // namespace disk_cache