Revert of Remove void** from disk_cache interface.

net/http/mock_http_cache.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/http/mock_http_cache.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
@@ skipping 439 matching lines @@
                                       const base::Time end_time,
                                       const net::CompletionCallback& callback) {
   return net::ERR_NOT_IMPLEMENTED;
 }
 
 int MockDiskCache::DoomEntriesSince(const base::Time initial_time,
                                     const net::CompletionCallback& callback) {
   return net::ERR_NOT_IMPLEMENTED;
 }
 
-class MockDiskCache::NotImplementedIterator : public Iterator {
- public:
-  virtual int OpenNextEntry(disk_cache::Entry** next_entry,
-                            const net::CompletionCallback& callback) OVERRIDE {
-    return net::ERR_NOT_IMPLEMENTED;
-  }
-};
+int MockDiskCache::OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
+                                 const net::CompletionCallback& callback) {
+  return net::ERR_NOT_IMPLEMENTED;
+}
 
-scoped_ptr<disk_cache::Backend::Iterator> MockDiskCache::CreateIterator() {
-  return scoped_ptr<Iterator>(new NotImplementedIterator());
+void MockDiskCache::EndEnumeration(void** iter) {
 }
 
 void MockDiskCache::GetStats(
     std::vector<std::pair<std::string, std::string> >* stats) {
 }
 
 void MockDiskCache::OnExternalCacheHit(const std::string& key) {
 }
 
 void MockDiskCache::ReleaseAll() {
@@ skipping 150 matching lines @@
 void MockBlockingBackendFactory::FinishCreation() {
   block_ = false;
   if (!callback_.is_null()) {
     if (!fail_)
       backend_->reset(new MockDiskCache());
     net::CompletionCallback cb = callback_;
     callback_.Reset();
     cb.Run(Result());  // This object can be deleted here.
   }
 }