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

net/disk_cache/disk_cache_test_base.cc

Index: net/disk_cache/disk_cache_test_base.cc
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc
index c3d94e6ac9ae30249444d35dd4e7aa3f21792852..d0f984256ad425113fb440d5b4fb4017b8e9cbe5 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -52,20 +52,6 @@
   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),
@@ -167,9 +153,11 @@
   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() {