Http cache: Implement a timeout for the cache lock.

net/http/http_cache_unittest.cc

 // Copyright (c) 2012 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/http_cache.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1681 matching lines @@
 
   EXPECT_EQ(5, cache.network_layer()->transaction_count());
   EXPECT_EQ(0, cache.disk_cache()->open_count());
   EXPECT_EQ(5, cache.disk_cache()->create_count());
 
   for (int i = 0; i < kNumTransactions; ++i) {
     delete context_list[i];
   }
 }
 
+// Tests that a (simulated) timeout allows transactions waiting on the cache
+// lock to continue.
+TEST(HttpCache, SimpleGET_WriterTimeout) {
+  MockHttpCache cache;
+  cache.BypassCacheLock();
+
+  MockHttpRequest request(kSimpleGET_Transaction);
+  Context c1, c2;
+  ASSERT_EQ(net::OK, cache.CreateTransaction(&c1.trans));
+  ASSERT_EQ(net::ERR_IO_PENDING,
+            c1.trans->Start(&request, c1.callback.callback(),
+                            net::BoundNetLog()));
+  ASSERT_EQ(net::OK, cache.CreateTransaction(&c2.trans));
+  ASSERT_EQ(net::ERR_IO_PENDING,
+            c2.trans->Start(&request, c2.callback.callback(),
+                            net::BoundNetLog()));
+
+  // The second request is queued after the first one.
+
+  c2.callback.WaitForResult();
+  ReadAndVerifyTransaction(c2.trans.get(), kSimpleGET_Transaction);
+
+  // Complete the first transaction.
+  c1.callback.WaitForResult();
+  ReadAndVerifyTransaction(c1.trans.get(), kSimpleGET_Transaction);
+}
+
 TEST(HttpCache, SimpleGET_AbandonedCacheRead) {
   MockHttpCache cache;
 
   // write to the cache
   RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
 
   MockHttpRequest request(kSimpleGET_Transaction);
   net::TestCompletionCallback callback;
 
   scoped_ptr<net::HttpTransaction> trans;
@@ skipping 4697 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
 
   // Read bytes 20-29 and 50-59 from the network, bytes 30-49 from the cache.
   transaction.request_headers = "Range: bytes = 20-59\r\n" EXTRA_HEADER;
   transaction.data = "rg: 20-29 rg: 30-39 rg: 40-49 rg: 50-59 ";
   received_bytes = RunTransactionAndGetReceivedBytes(cache, transaction);
   EXPECT_EQ(range_response_size * 2, received_bytes);
 
   RemoveMockTransaction(&kRangeGET_TransactionOK);
 }