Reland of "Remove void** from disk_cache interface" w/ blockfile iter fix.

net/tools/dump_cache/simple_cache_dumper.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/tools/dump_cache/simple_cache_dumper.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/threading/thread.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/tools/dump_cache/cache_dumper.h"
 
 namespace net {
 
 SimpleCacheDumper::SimpleCacheDumper(base::FilePath input_path,
                                      base::FilePath output_path)
     : state_(STATE_NONE),
       input_path_(input_path),
       output_path_(output_path),
       writer_(new DiskDumper(output_path)),
       cache_thread_(new base::Thread("CacheThead")),
-      iter_(NULL),
       src_entry_(NULL),
       dst_entry_(NULL),
       io_callback_(base::Bind(&SimpleCacheDumper::OnIOComplete,
                               base::Unretained(this))),
       rv_(0) {
 }
 
 SimpleCacheDumper::~SimpleCacheDumper() {
 }
 
@@ skipping 103 matching lines @@
       disk_cache::kNoRandom);
 
   state_ = STATE_OPEN_ENTRY;
   return OK;
 }
 
 int SimpleCacheDumper::DoOpenEntry() {
   DCHECK(!dst_entry_);
   DCHECK(!src_entry_);
   state_ = STATE_OPEN_ENTRY_COMPLETE;
-  return cache_->OpenNextEntry(&iter_, &src_entry_, io_callback_);
+  if (!iter_)
+    iter_ = cache_->CreateIterator();
+  return iter_->OpenNextEntry(&src_entry_, io_callback_);
 }
 
 int SimpleCacheDumper::DoOpenEntryComplete(int rv) {
   // ERR_FAILED indicates iteration finished.
-  if (rv == ERR_FAILED) {
-    cache_->EndEnumeration(&iter_);
+  if (rv == ERR_FAILED)
     return OK;
-  }
 
   if (rv < 0)
     return rv;
 
   state_ = STATE_CREATE_ENTRY;
   return OK;
 }
 
 int SimpleCacheDumper::DoCreateEntry() {
   DCHECK(!dst_entry_);
@@ skipping 92 matching lines @@
   rv = DoLoop(rv);
 
   if (rv != ERR_IO_PENDING) {
     rv_ = rv;
     cache_.reset();
     base::MessageLoop::current()->Quit();
   }
 }
 
 }  // namespace net