Reland r113263 rebased after revert of r113249.

net/http/mock_http_cache.h

 // Copyright (c) 2011 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.
 
 // This is a mock of the http cache and related testing classes. To be fair, it
 // is not really a mock http cache given that it uses the real implementation of
 // the http cache, but it has fake implementations of all required components,
 // so it is useful for unit tests at the http layer.
 
 #ifndef NET_HTTP_MOCK_HTTP_CACHE_H_
@@ skipping 97 matching lines @@
                                  const base::Time end_time,
                                  net::OldCompletionCallback* callback) OVERRIDE;
   virtual int DoomEntriesBetween(
       const base::Time initial_time,
       const base::Time end_time,
       const net::CompletionCallback& callback) OVERRIDE;
   virtual int DoomEntriesSince(const base::Time initial_time,
                                net::OldCompletionCallback* callback) OVERRIDE;
   virtual int OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
                             net::OldCompletionCallback* callback) OVERRIDE;
+  virtual int OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
+                            const net::CompletionCallback& callback) OVERRIDE;
   virtual void EndEnumeration(void** iter) OVERRIDE;
   virtual void GetStats(
       std::vector<std::pair<std::string, std::string> >* stats) OVERRIDE;
   virtual void OnExternalCacheHit(const std::string& key) OVERRIDE;
 
   // Returns number of times a cache entry was successfully opened.
   int open_count() const { return open_count_; }
 
   // Returns number of times a cache entry was successfully created.
   int create_count() const { return create_count_; }
@@ skipping 105 matching lines @@
  private:
   int Result() { return fail_ ? net::ERR_FAILED : net::OK; }
 
   disk_cache::Backend** backend_;
   net::OldCompletionCallback* callback_;
   bool block_;
   bool fail_;
 };
 
 #endif  // NET_HTTP_MOCK_HTTP_CACHE_H_