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

net/http/mock_http_cache.cc

Index: net/http/mock_http_cache.cc
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc
index a91b2c1aa83107c737b67aa40ab064b1ef44f1f3..cbae9b80b9335487fb6cebe72a0a3e92a26810c4 100644
--- a/net/http/mock_http_cache.cc
+++ b/net/http/mock_http_cache.cc
@@ -457,12 +457,16 @@ int MockDiskCache::DoomEntriesSince(const base::Time initial_time,
   return net::ERR_NOT_IMPLEMENTED;
 }
 
-int MockDiskCache::OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
-                                 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;
+  }
+};
 
-void MockDiskCache::EndEnumeration(void** iter) {
+scoped_ptr<disk_cache::Backend::Iterator> MockDiskCache::CreateIterator() {
+  return scoped_ptr<Iterator>(new NotImplementedIterator());
 }
 
 void MockDiskCache::GetStats(