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

net/disk_cache/disk_cache_test_base.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/disk_cache_test_base.h"
 
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 34 matching lines @@
 }
 
 bool DiskCacheTest::CleanupCacheDir() {
   return DeleteCache(cache_path_);
 }
 
 void DiskCacheTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 }
 
-DiskCacheTestWithCache::TestIterator::TestIterator(
-    scoped_ptr<disk_cache::Backend::Iterator> iterator)
-    : iterator_(iterator.Pass()) {
-}
-
-DiskCacheTestWithCache::TestIterator::~TestIterator() {}
-
-int DiskCacheTestWithCache::TestIterator::OpenNextEntry(
-    disk_cache::Entry** next_entry) {
-  net::TestCompletionCallback cb;
-  int rv = iterator_->OpenNextEntry(next_entry, cb.callback());
-  return cb.GetResult(rv);
-}
-
 DiskCacheTestWithCache::DiskCacheTestWithCache()
     : cache_impl_(NULL),
       simple_cache_impl_(NULL),
       mem_cache_(NULL),
       mask_(0),
       size_(0),
       type_(net::DISK_CACHE),
       memory_only_(false),
       simple_cache_mode_(false),
       simple_cache_wait_for_index_(true),
@@ skipping 81 matching lines @@
   int rv = cache_->DoomEntriesBetween(initial_time, end_time, cb.callback());
   return cb.GetResult(rv);
 }
 
 int DiskCacheTestWithCache::DoomEntriesSince(const base::Time initial_time) {
   net::TestCompletionCallback cb;
   int rv = cache_->DoomEntriesSince(initial_time, cb.callback());
   return cb.GetResult(rv);
 }
 
-scoped_ptr<DiskCacheTestWithCache::TestIterator>
-    DiskCacheTestWithCache::CreateIterator() {
-  return scoped_ptr<TestIterator>(new TestIterator(cache_->CreateIterator()));
+int DiskCacheTestWithCache::OpenNextEntry(void** iter,
+                                          disk_cache::Entry** next_entry) {
+  net::TestCompletionCallback cb;
+  int rv = cache_->OpenNextEntry(iter, next_entry, cb.callback());
+  return cb.GetResult(rv);
 }
 
 void DiskCacheTestWithCache::FlushQueueForTest() {
   if (memory_only_ || !cache_impl_)
     return;
 
   net::TestCompletionCallback cb;
   int rv = cache_impl_->FlushQueueForTest(cb.callback());
   EXPECT_EQ(net::OK, cb.GetResult(rv));
 }
@@ skipping 144 matching lines @@
   if (size_)
     EXPECT_TRUE(cache_impl_->SetMaxSize(size_));
   if (new_eviction_)
     cache_impl_->SetNewEviction();
   cache_impl_->SetType(type_);
   cache_impl_->SetFlags(flags);
   net::TestCompletionCallback cb;
   int rv = cache_impl_->Init(cb.callback());
   ASSERT_EQ(net::OK, cb.GetResult(rv));
 }