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

net/url_request/view_cache_helper.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/url_request/view_cache_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/escape.h"
@@ skipping 27 matching lines @@
       "</a></td></tr>";
   return row;
 }
 
 }  // namespace.
 
 ViewCacheHelper::ViewCacheHelper()
     : context_(NULL),
       disk_cache_(NULL),
       entry_(NULL),
+      iter_(NULL),
       buf_len_(0),
       index_(0),
       data_(NULL),
       next_state_(STATE_NONE),
       weak_factory_(this) {
 }
 
 ViewCacheHelper::~ViewCacheHelper() {
   if (entry_)
     entry_->Close();
@@ skipping 176 matching lines @@
     next_state_ = STATE_OPEN_NEXT_ENTRY;
     return OK;
   }
 
   next_state_ = STATE_OPEN_ENTRY;
   return OK;
 }
 
 int ViewCacheHelper::DoOpenNextEntry() {
   next_state_ = STATE_OPEN_NEXT_ENTRY_COMPLETE;
-  if (!iter_)
-    iter_ = disk_cache_->CreateIterator();
-  return
-      iter_->OpenNextEntry(&entry_, base::Bind(&ViewCacheHelper::OnIOComplete,
-                                               base::Unretained(this)));
+  return disk_cache_->OpenNextEntry(
+      &iter_, &entry_,
+      base::Bind(&ViewCacheHelper::OnIOComplete, base::Unretained(this)));
 }
 
 int ViewCacheHelper::DoOpenNextEntryComplete(int result) {
   if (result == ERR_FAILED) {
     data_->append(VIEW_CACHE_TAIL);
     return OK;
   }
 
   DCHECK_EQ(OK, result);
   data_->append(FormatEntryInfo(entry_, url_prefix_));
@@ skipping 100 matching lines @@
     entry_ = NULL;
   }
   return OK;
 }
 
 void ViewCacheHelper::OnIOComplete(int result) {
   DoLoop(result);
 }
 
 }  // namespace net.