Reland r113263 rebased after revert of r113249.

net/http/mock_http_cache.cc

 // 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.
 
 #include "net/http/mock_http_cache.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 450 matching lines @@
 int MockDiskCache::DoomEntriesSince(const base::Time initial_time,
                                     net::OldCompletionCallback* callback) {
   return net::ERR_NOT_IMPLEMENTED;
 }
 
 int MockDiskCache::OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
                                  net::OldCompletionCallback* callback) {
   return net::ERR_NOT_IMPLEMENTED;
 }
 
+int MockDiskCache::OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
+                                 const net::CompletionCallback& callback) {
+  return net::ERR_NOT_IMPLEMENTED;
+}
+
 void MockDiskCache::EndEnumeration(void** iter) {
 }
 
 void MockDiskCache::GetStats(
     std::vector<std::pair<std::string, std::string> >* stats) {
 }
 
 void MockDiskCache::OnExternalCacheHit(const std::string& key) {
 }
 
@@ skipping 138 matching lines @@
 void MockBlockingBackendFactory::FinishCreation() {
   block_ = false;
   if (callback_) {
     if (!fail_)
       *backend_ = new MockDiskCache();
     net::OldCompletionCallback* cb = callback_;
     callback_ = NULL;
     cb->Run(Result());  // This object can be deleted here.
   }
 }