Remove void** from disk_cache interface.

net/disk_cache/blockfile/backend_impl_v3.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/blockfile/backend_impl_v3.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 642 matching lines @@
       SyncEndEnumeration(iter);
       return net::OK;
     }
 
     entry->DoomImpl();
     entry->Release();
     SyncEndEnumeration(iter);  // Dooming the entry invalidates the iterator.
   }
 }
 
-int BackendImplV3::OpenNextEntry(void** iter, Entry** next_entry,
+int BackendImplV3::OpenNextEntry(Iterator* iter, Entry** next_entry,
                                  const CompletionCallback& callback) {
+  // TODO(gavinp): Remove all void** iter from cache.
   DCHECK(!callback.is_null());
-  background_queue_.OpenNextEntry(iter, next_entry, callback);
+  class State : public EnumerationState {
+   public:
+    explicit State(base::WeakPtr<InFlightBackendIO> background_queue)
+        : background_queue_(background_queue),
+          data_(NULL) {}
+
+    virtual ~State() {
+      if (background_queue_)
+        background_queue_->EndEnumeration(*iter());
+    }
+
+    void** data() { return &data_; }
+
+   private:
+    base::WeakPtr<InFlightBackendIO> background_queue_;
+    void* data_;
+  };
+  if (!*iter)
+    iter->reset(new State(GetBackgroundQueue()));
+  State* state = static_cast<State*>(iter->get());
+
+  background_queue_.OpenNextEntry(state->data(), next_entry, callback);
   return net::ERR_IO_PENDING;
 }
 
 void BackendImplV3::EndEnumeration(void** iter) {
   scoped_ptr<IndexIterator> iterator(
       reinterpret_cast<IndexIterator*>(*iter));
   *iter = NULL;
 }
 
 void BackendImplV3::GetStats(StatsItems* stats) {
@@ skipping 813 matching lines @@
                                       base::Time end_time,
                                       const CompletionCallback& callback) {
   return net::ERR_FAILED;
 }
 
 int BackendImplV3::DoomEntriesSince(base::Time initial_time,
                                     const CompletionCallback& callback) {
   return net::ERR_FAILED;
 }
 
-int BackendImplV3::OpenNextEntry(void** iter, Entry** next_entry,
+int BackendImplV3::OpenNextEntry(Iterator* iter, Entry** next_entry,
                                  const CompletionCallback& callback) {
   return net::ERR_FAILED;
 }
 
-void BackendImplV3::EndEnumeration(void** iter) {
-  NOTIMPLEMENTED();
-}
-
 void BackendImplV3::GetStats(StatsItems* stats) {
   NOTIMPLEMENTED();
 }
 
 void BackendImplV3::OnExternalCacheHit(const std::string& key) {
   NOTIMPLEMENTED();
 }
 
 void BackendImplV3::CleanupCache() {
 }
 
 }  // namespace disk_cache