BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/chromium/net/http/mock_http_cache.cc b/chromium/net/http/mock_http_cache.cc
index 5dbd486df0f..4ca542ea5cb 100644
--- a/chromium/net/http/mock_http_cache.cc
+++ b/chromium/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:
+  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(
@@ -516,6 +520,10 @@ int MockHttpCache::CreateTransaction(scoped_ptr<net::HttpTransaction>* trans) {
   return http_cache_.CreateTransaction(net::DEFAULT_PRIORITY, trans);
 }
 
+void MockHttpCache::BypassCacheLock() {
+  http_cache_.BypassLockForTest();
+}
+
 bool MockHttpCache::ReadResponseInfo(disk_cache::Entry* disk_entry,
                                      net::HttpResponseInfo* response_info,
                                      bool* response_truncated) {