Reland r113263 rebased after revert of r113249.

net/disk_cache/mem_backend_impl.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.
 
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
 #ifndef NET_DISK_CACHE_MEM_BACKEND_IMPL_H__
 #define NET_DISK_CACHE_MEM_BACKEND_IMPL_H__
 #pragma once
 
@@ skipping 65 matching lines @@
                                  const base::Time end_time,
                                  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,
                                OldCompletionCallback* callback) OVERRIDE;
   virtual int OpenNextEntry(void** iter, Entry** next_entry,
                             OldCompletionCallback* callback) OVERRIDE;
+  virtual int OpenNextEntry(void** iter, 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;
 
  private:
   typedef base::hash_map<std::string, MemEntryImpl*> EntryMap;
 
   // Old Backend interface.
   bool OpenEntry(const std::string& key, Entry** entry);
@@ skipping 20 matching lines @@
   int32 current_size_;
 
   net::NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(MemBackendImpl);
 };
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_MEM_BACKEND_IMPL_H__