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 d0f984256ad425113fb440d5b4fb4017b8e9cbe5..943bded039144a7328e632639ae2bd237cd2c211 100644
--- a/net/disk_cache/disk_cache_test_base.cc
+++ b/net/disk_cache/disk_cache_test_base.cc
@@ -52,6 +52,19 @@ void DiskCacheTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 }
 
+DiskCacheTestWithCache::TestIterator::TestIterator(
+    scoped_ptr<disk_cache::Backend::Iterator> iterator)
+    : iterator_(iterator.Pass()) {}

[rvargas (doing something else), 2014/09/18 02:32:12]

nit: not a single line anymore

[gavinp, 2014/09/18 18:13:04]

Done.

+
+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),
@@ -153,11 +166,9 @@ int DiskCacheTestWithCache::DoomEntriesSince(const base::Time initial_time) {
   return cb.GetResult(rv);
 }
 
-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);
+scoped_ptr<DiskCacheTestWithCache::TestIterator>
+    DiskCacheTestWithCache::CreateIterator() {
+  return scoped_ptr<TestIterator>(new TestIterator(cache_->CreateIterator()));
 }
 
 void DiskCacheTestWithCache::FlushQueueForTest() {