Split DiskCacheBasedSSLHostInfo unit tests to its own

net/http/mock_http_cache.cc

Index: net/http/mock_http_cache.cc
===================================================================
--- net/http/mock_http_cache.cc	(revision 110190)
+++ net/http/mock_http_cache.cc	(working copy)
@@ -2,36 +2,13 @@
 // 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 "net/http/mock_http_cache.h"
 
 #include "base/bind.h"
-#include "base/hash_tables.h"
-#include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
-#include "base/stringprintf.h"
-#include "net/base/cache_type.h"
-#include "net/base/cert_status_flags.h"
-#include "net/base/host_port_pair.h"
-#include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_log_unittest.h"
-#include "net/base/ssl_cert_request_info.h"
-#include "net/base/ssl_config_service.h"
-#include "net/disk_cache/disk_cache.h"
-#include "net/http/disk_cache_based_ssl_host_info.h"
-#include "net/http/http_byte_range.h"
-#include "net/http/http_request_headers.h"
-#include "net/http/http_request_info.h"
-#include "net/http/http_response_headers.h"
-#include "net/http/http_response_info.h"
-#include "net/http/http_transaction.h"
-#include "net/http/http_transaction_unittest.h"
-#include "net/http/http_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::Time;
-
 namespace {
 
 int GetTestModeForEntry(const std::string& key) {
@@ -55,5169 +32,582 @@
 }
 
 // We can override the test mode for a given operation by setting this global
-// variable. Just remember to reset it after the test!.
+// variable.
 int g_test_mode = 0;
 
-// Returns the test mode after considering the global override.
-int GetEffectiveTestMode(int test_mode) {
-  if (!g_test_mode)
-    return test_mode;
+}  // namespace
 
-  return g_test_mode;
-}
-
 //-----------------------------------------------------------------------------
-// mock disk cache (a very basic memory cache implementation)
 
-static const int kNumCacheEntryDataIndices = 3;
-
-class MockDiskEntry : public disk_cache::Entry,
-                      public base::RefCounted<MockDiskEntry> {
- public:
-  MockDiskEntry()
-      : test_mode_(0), doomed_(false), sparse_(false),
-        fail_requests_(false), busy_(false), delayed_(false) {
-  }
-
-  explicit MockDiskEntry(const std::string& key)
-      : key_(key), doomed_(false), sparse_(false),
-        fail_requests_(false), busy_(false), delayed_(false) {
-    test_mode_ = GetTestModeForEntry(key);
-  }
-
-  bool is_doomed() const { return doomed_; }
-
-  virtual void Doom() {
-    doomed_ = true;
-  }
-
-  virtual void Close() {
-    Release();
-  }
-
-  virtual std::string GetKey() const {
-    if (fail_requests_)
-      return std::string();
-    return key_;
-  }
-
-  virtual Time GetLastUsed() const {
-    return Time::FromInternalValue(0);
-  }
-
-  virtual Time GetLastModified() const {
-    return Time::FromInternalValue(0);
-  }
-
-  virtual int32 GetDataSize(int index) const {
-    DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
-    return static_cast<int32>(data_[index].size());
-  }
-
-  virtual int ReadData(int index, int offset, net::IOBuffer* buf, int buf_len,
-                       net::OldCompletionCallback* callback) {
-    DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
-    DCHECK(callback);
-
-    if (fail_requests_)
-      return net::ERR_CACHE_READ_FAILURE;
-
-    if (offset < 0 || offset > static_cast<int>(data_[index].size()))
-      return net::ERR_FAILED;
-    if (static_cast<size_t>(offset) == data_[index].size())
-      return 0;
-
-    int num = std::min(buf_len, static_cast<int>(data_[index].size()) - offset);
-    memcpy(buf->data(), &data_[index][offset], num);
-
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
-      return num;
-
-    CallbackLater(callback, num);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int WriteData(int index, int offset, net::IOBuffer* buf, int buf_len,
-                        net::OldCompletionCallback* callback, bool truncate) {
-    DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
-    DCHECK(callback);
-    DCHECK(truncate);
-
-    if (fail_requests_) {
-      CallbackLater(callback, net::ERR_CACHE_READ_FAILURE);
-      return net::ERR_IO_PENDING;
-    }
-
-    if (offset < 0 || offset > static_cast<int>(data_[index].size()))
-      return net::ERR_FAILED;
-
-    data_[index].resize(offset + buf_len);
-    if (buf_len)
-      memcpy(&data_[index][offset], buf->data(), buf_len);
-
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
-      return buf_len;
-
-    CallbackLater(callback, buf_len);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len,
-                             net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    if (!sparse_ || busy_)
-      return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
-    if (offset < 0)
-      return net::ERR_FAILED;
-
-    if (fail_requests_)
-      return net::ERR_CACHE_READ_FAILURE;
-
-    DCHECK(offset < kint32max);
-    int real_offset = static_cast<int>(offset);
-    if (!buf_len)
-      return 0;
-
-    int num = std::min(static_cast<int>(data_[1].size()) - real_offset,
-                       buf_len);
-    memcpy(buf->data(), &data_[1][real_offset], num);
-
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
-      return num;
-
-    CallbackLater(callback, num);
-    busy_ = true;
-    delayed_ = false;
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int WriteSparseData(int64 offset, net::IOBuffer* buf, int buf_len,
-                              net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    if (busy_)
-      return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
-    if (!sparse_) {
-      if (data_[1].size())
-        return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
-      sparse_ = true;
-    }
-    if (offset < 0)
-      return net::ERR_FAILED;
-    if (!buf_len)
-      return 0;
-
-    if (fail_requests_)
-      return net::ERR_CACHE_READ_FAILURE;
-
-    DCHECK(offset < kint32max);
-    int real_offset = static_cast<int>(offset);
-
-    if (static_cast<int>(data_[1].size()) < real_offset + buf_len)
-      data_[1].resize(real_offset + buf_len);
-
-    memcpy(&data_[1][real_offset], buf->data(), buf_len);
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
-      return buf_len;
-
-    CallbackLater(callback, buf_len);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int GetAvailableRange(int64 offset, int len, int64* start,
-                                net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    if (!sparse_ || busy_)
-      return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
-    if (offset < 0)
-      return net::ERR_FAILED;
-
-    if (fail_requests_)
-      return net::ERR_CACHE_READ_FAILURE;
-
-    *start = offset;
-    DCHECK(offset < kint32max);
-    int real_offset = static_cast<int>(offset);
-    if (static_cast<int>(data_[1].size()) < real_offset)
-      return 0;
-
-    int num = std::min(static_cast<int>(data_[1].size()) - real_offset, len);
-    int count = 0;
-    for (; num > 0; num--, real_offset++) {
-      if (!count) {
-        if (data_[1][real_offset]) {
-          count++;
-          *start = real_offset;
-        }
-      } else {
-        if (!data_[1][real_offset])
-          break;
-        count++;
-      }
-    }
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
-      return count;
-
-    CallbackLater(callback, count);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual bool CouldBeSparse() const {
-    return sparse_;
-  }
-
-  virtual void CancelSparseIO() { cancel_ = true; }
-
-  virtual int ReadyForSparseIO(net::OldCompletionCallback* completion_callback) {
-    if (!cancel_)
-      return net::OK;
-
-    cancel_ = false;
-    DCHECK(completion_callback);
-    if (GetEffectiveTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
-      return net::OK;
-
-    // The pending operation is already in the message loop (and hopefuly
-    // already in the second pass).  Just notify the caller that it finished.
-    CallbackLater(completion_callback, 0);
-    return net::ERR_IO_PENDING;
-  }
-
-  // Fail most subsequent requests.
-  void set_fail_requests() { fail_requests_ = true; }
-
-  // If |value| is true, don't deliver any completion callbacks until called
-  // again with |value| set to false.  Caution: remember to enable callbacks
-  // again or all subsequent tests will fail.
-  static void IgnoreCallbacks(bool value) {
-    if (ignore_callbacks_ == value)
-      return;
-    ignore_callbacks_ = value;
-    if (!value)
-      StoreAndDeliverCallbacks(false, NULL, NULL, 0);
-  }
-
- private:
-  friend class base::RefCounted<MockDiskEntry>;
-
-  struct CallbackInfo {
-    scoped_refptr<MockDiskEntry> entry;
-    net::OldCompletionCallback* callback;
-    int result;
-  };
-
-  ~MockDiskEntry() {}
-
-  // Unlike the callbacks for MockHttpTransaction, we want this one to run even
-  // if the consumer called Close on the MockDiskEntry.  We achieve that by
-  // leveraging the fact that this class is reference counted.
-  void CallbackLater(net::OldCompletionCallback* callback, int result) {
-    if (ignore_callbacks_)
-      return StoreAndDeliverCallbacks(true, this, callback, result);
-    MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
-        &MockDiskEntry::RunCallback, this, callback, result));
-  }
-  void RunCallback(net::OldCompletionCallback* callback, int result) {
-    if (busy_) {
-      // This is kind of hacky, but controlling the behavior of just this entry
-      // from a test is sort of complicated.  What we really want to do is
-      // delay the delivery of a sparse IO operation a little more so that the
-      // request start operation (async) will finish without seeing the end of
-      // this operation (already posted to the message loop)... and without
-      // just delaying for n mS (which may cause trouble with slow bots).  So
-      // we re-post this operation (all async sparse IO operations will take two
-      // trips trhough the message loop instead of one).
-      if (!delayed_) {
-        delayed_ = true;
-        return CallbackLater(callback, result);
-      }
-    }
-    busy_ = false;
-    callback->Run(result);
-  }
-
-  // When |store| is true, stores the callback to be delivered later; otherwise
-  // delivers any callback previously stored.
-  static void StoreAndDeliverCallbacks(bool store, MockDiskEntry* entry,
-                                       net::OldCompletionCallback* callback,
-                                       int result) {
-    static std::vector<CallbackInfo> callback_list;
-    if (store) {
-      CallbackInfo c = {entry, callback, result};
-      callback_list.push_back(c);
-    } else {
-      for (size_t i = 0; i < callback_list.size(); i++) {
-        CallbackInfo& c = callback_list[i];
-        c.entry->CallbackLater(c.callback, c.result);
-      }
-      callback_list.clear();
-    }
-  }
-
-  std::string key_;
-  std::vector<char> data_[kNumCacheEntryDataIndices];
-  int test_mode_;
-  bool doomed_;
-  bool sparse_;
-  bool fail_requests_;
-  bool busy_;
-  bool delayed_;
-  static bool cancel_;
-  static bool ignore_callbacks_;
+struct MockDiskEntry::CallbackInfo {
+  scoped_refptr<MockDiskEntry> entry;
+  net::OldCompletionCallback* callback;
+  int result;
 };
 
-// Statics.
-bool MockDiskEntry::cancel_ = false;
-bool MockDiskEntry::ignore_callbacks_ = false;
-
-class MockDiskCache : public disk_cache::Backend {
- public:
-  MockDiskCache()
-      : open_count_(0), create_count_(0), fail_requests_(false),
-        soft_failures_(false) {
-  }
-
-  ~MockDiskCache() {
-    ReleaseAll();
-  }
-
-  virtual int32 GetEntryCount() const {
-    return static_cast<int32>(entries_.size());
-  }
-
-  virtual int OpenEntry(const std::string& key, disk_cache::Entry** entry,
-                        net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    if (fail_requests_)
-      return net::ERR_CACHE_OPEN_FAILURE;
-
-    EntryMap::iterator it = entries_.find(key);
-    if (it == entries_.end())
-      return net::ERR_CACHE_OPEN_FAILURE;
-
-    if (it->second->is_doomed()) {
-      it->second->Release();
-      entries_.erase(it);
-      return net::ERR_CACHE_OPEN_FAILURE;
-    }
-
-    open_count_++;
-
-    it->second->AddRef();
-    *entry = it->second;
-
-    if (soft_failures_)
-      it->second->set_fail_requests();
-
-    if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
-      return net::OK;
-
-    CallbackLater(callback, net::OK);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry,
-                          net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    if (fail_requests_)
-      return net::ERR_CACHE_CREATE_FAILURE;
-
-    EntryMap::iterator it = entries_.find(key);
-    if (it != entries_.end()) {
-      DCHECK(it->second->is_doomed());
-      it->second->Release();
-      entries_.erase(it);
-    }
-
-    create_count_++;
-
-    MockDiskEntry* new_entry = new MockDiskEntry(key);
-
-    new_entry->AddRef();
-    entries_[key] = new_entry;
-
-    new_entry->AddRef();
-    *entry = new_entry;
-
-    if (soft_failures_)
-      new_entry->set_fail_requests();
-
-    if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
-      return net::OK;
-
-    CallbackLater(callback, net::OK);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int DoomEntry(const std::string& key,
-                        net::OldCompletionCallback* callback) {
-    DCHECK(callback);
-    EntryMap::iterator it = entries_.find(key);
-    if (it != entries_.end()) {
-      it->second->Release();
-      entries_.erase(it);
-    }
-
-    if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
-      return net::OK;
-
-    CallbackLater(callback, net::OK);
-    return net::ERR_IO_PENDING;
-  }
-
-  virtual int DoomAllEntries(net::OldCompletionCallback* callback) {
-    return net::ERR_NOT_IMPLEMENTED;
-  }
-
-  virtual int DoomEntriesBetween(const base::Time initial_time,
-                                 const base::Time end_time,
-                                 net::OldCompletionCallback* callback) {
-    return net::ERR_NOT_IMPLEMENTED;
-  }
-
-  virtual int DoomEntriesSince(const base::Time initial_time,
-                               net::OldCompletionCallback* callback) {
-    return net::ERR_NOT_IMPLEMENTED;
-  }
-
-  virtual int OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
-                            net::OldCompletionCallback* callback) {
-    return net::ERR_NOT_IMPLEMENTED;
-  }
-
-  virtual void EndEnumeration(void** iter) {}
-
-  virtual void GetStats(
-      std::vector<std::pair<std::string, std::string> >* stats) {
-  }
-
-  virtual void OnExternalCacheHit(const std::string& key) {}
-
-  // 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_; }
-
-  // Fail any subsequent CreateEntry and OpenEntry.
-  void set_fail_requests() { fail_requests_ = true; }
-
-  // Return entries that fail some of their requests.
-  void set_soft_failures(bool value) { soft_failures_ = value; }
-
-  void ReleaseAll() {
-    EntryMap::iterator it = entries_.begin();
-    for (; it != entries_.end(); ++it)
-      it->second->Release();
-    entries_.clear();
-  }
-
- private:
-  typedef base::hash_map<std::string, MockDiskEntry*> EntryMap;
-
-  class CallbackRunner : public Task {
-   public:
-    CallbackRunner(net::OldCompletionCallback* callback, int result)
-        : callback_(callback), result_(result) {}
-    virtual void Run() {
-      callback_->Run(result_);
-    }
-
-   private:
-    net::OldCompletionCallback* callback_;
-    int result_;
-    DISALLOW_COPY_AND_ASSIGN(CallbackRunner);
-  };
-
-  void CallbackLater(net::OldCompletionCallback* callback, int result) {
-    MessageLoop::current()->PostTask(FROM_HERE,
-                                     new CallbackRunner(callback, result));
-  }
-
-  EntryMap entries_;
-  int open_count_;
-  int create_count_;
-  bool fail_requests_;
-  bool soft_failures_;
-};
-
-class MockBackendFactory : public net::HttpCache::BackendFactory {
- public:
-  virtual int CreateBackend(net::NetLog*  /* net_log */,
-                            disk_cache::Backend** backend,
-                            net::OldCompletionCallback* callback) {
-    *backend = new MockDiskCache();
-    return net::OK;
-  }
-};
-
-class MockHttpCache {
- public:
-  MockHttpCache()
-      : http_cache_(new MockNetworkLayer(), NULL, new MockBackendFactory()) {
-  }
-
-  explicit MockHttpCache(net::HttpCache::BackendFactory* disk_cache_factory)
-      : http_cache_(new MockNetworkLayer(), NULL, disk_cache_factory) {
-  }
-
-  net::HttpCache* http_cache() { return &http_cache_; }
-
-  MockNetworkLayer* network_layer() {
-    return static_cast<MockNetworkLayer*>(http_cache_.network_layer());
-  }
-  MockDiskCache* disk_cache() {
-    TestOldCompletionCallback cb;
-    disk_cache::Backend* backend;
-    int rv = http_cache_.GetBackend(&backend, &cb);
-    rv = cb.GetResult(rv);
-    return (rv == net::OK) ? static_cast<MockDiskCache*>(backend) : NULL;
-  }
-
-  // Helper function for reading response info from the disk cache.
-  static bool ReadResponseInfo(disk_cache::Entry* disk_entry,
-                               net::HttpResponseInfo* response_info,
-                               bool* response_truncated) {
-    int size = disk_entry->GetDataSize(0);
-
-    TestOldCompletionCallback cb;
-    scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(size));
-    int rv = disk_entry->ReadData(0, 0, buffer, size, &cb);
-    rv = cb.GetResult(rv);
-    EXPECT_EQ(size, rv);
-
-    return net::HttpCache::ParseResponseInfo(buffer->data(), size,
-                                             response_info,
-                                             response_truncated);
-  }
-
-  // Helper function for writing response info into the disk cache.
-  static bool WriteResponseInfo(disk_cache::Entry* disk_entry,
-                                const net::HttpResponseInfo* response_info,
-                                bool skip_transient_headers,
-                                bool response_truncated) {
-    Pickle pickle;
-    response_info->Persist(
-        &pickle, skip_transient_headers, response_truncated);
-
-    TestOldCompletionCallback cb;
-    scoped_refptr<net::WrappedIOBuffer> data(new net::WrappedIOBuffer(
-        reinterpret_cast<const char*>(pickle.data())));
-    int len = static_cast<int>(pickle.size());
-
-    int rv =  disk_entry->WriteData(0, 0, data, len, &cb, true);
-    rv = cb.GetResult(rv);
-    return (rv == len);
-  }
-
-  // Helper function to synchronously open a backend entry.
-  bool OpenBackendEntry(const std::string& key, disk_cache::Entry** entry) {
-    TestOldCompletionCallback cb;
-    int rv = disk_cache()->OpenEntry(key, entry, &cb);
-    return (cb.GetResult(rv) == net::OK);
-  }
-
-  // Helper function to synchronously create a backend entry.
-  bool CreateBackendEntry(const std::string& key, disk_cache::Entry** entry,
-                          net::NetLog*  /* net_log */) {
-    TestOldCompletionCallback cb;
-    int rv = disk_cache()->CreateEntry(key, entry, &cb);
-    return (cb.GetResult(rv) == net::OK);
-  }
-
- private:
-  net::HttpCache http_cache_;
-};
-
-// This version of the disk cache doesn't invoke CreateEntry callbacks.
-class MockDiskCacheNoCB : public MockDiskCache {
-  virtual int CreateEntry(const std::string& key, disk_cache::Entry** entry,
-                          net::OldCompletionCallback* callback) {
-    return net::ERR_IO_PENDING;
-  }
-};
-
-class MockBackendNoCbFactory : public net::HttpCache::BackendFactory {
- public:
-  virtual int CreateBackend(net::NetLog*  /* net_log */,
-                            disk_cache::Backend** backend,
-                            net::OldCompletionCallback* callback) {
-    *backend = new MockDiskCacheNoCB();
-    return net::OK;
-  }
-};
-
-// This backend factory allows us to control the backend instantiation.
-class MockBlockingBackendFactory : public net::HttpCache::BackendFactory {
- public:
-  MockBlockingBackendFactory()
-      : backend_(NULL), callback_(NULL), block_(true), fail_(false) {}
-
-  virtual int CreateBackend(net::NetLog*  /* net_log */,
-                            disk_cache::Backend** backend,
-                            net::OldCompletionCallback* callback) {
-    if (!block_) {
-      if (!fail_)
-        *backend = new MockDiskCache();
-      return Result();
-    }
-
-    backend_ =  backend;
-    callback_ = callback;
-    return net::ERR_IO_PENDING;
-  }
-
-  // Completes the backend creation. Any blocked call will be notified via the
-  // provided callback.
-  void 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.
-    }
-  }
-
-  disk_cache::Backend** backend() { return backend_; }
-  void set_fail(bool fail) { fail_ = fail; }
-
-  net::OldCompletionCallback* callback() { return callback_; }
-
- private:
-  int Result() { return fail_ ? net::ERR_FAILED : net::OK; }
-
-  disk_cache::Backend** backend_;
-  net::OldCompletionCallback* callback_;
-  bool block_;
-  bool fail_;
-};
-
-class DeleteCacheOldCompletionCallback : public TestOldCompletionCallback {
- public:
-  explicit DeleteCacheOldCompletionCallback(MockHttpCache* cache)
-      : cache_(cache) {}
-
-  virtual void RunWithParams(const Tuple1<int>& params) {
-    delete cache_;
-    TestOldCompletionCallback::RunWithParams(params);
-  }
-
- private:
-  MockHttpCache* cache_;
-};
-
-//-----------------------------------------------------------------------------
-// helpers
-
-void ReadAndVerifyTransaction(net::HttpTransaction* trans,
-                              const MockTransaction& trans_info) {
-  std::string content;
-  int rv = ReadTransaction(trans, &content);
-
-  EXPECT_EQ(net::OK, rv);
-  std::string expected(trans_info.data);
-  EXPECT_EQ(expected, content);
+MockDiskEntry::MockDiskEntry()
+    : test_mode_(0), doomed_(false), sparse_(false),
+      fail_requests_(false), busy_(false), delayed_(false) {
 }
 
-void RunTransactionTestWithRequestAndLog(net::HttpCache* cache,
-                                         const MockTransaction& trans_info,
-                                         const MockHttpRequest& request,
-                                         net::HttpResponseInfo* response_info,
-                                         const net::BoundNetLog& net_log) {
-  TestOldCompletionCallback callback;
-
-  // write to the cache
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
-
-  rv = trans->Start(&request, &callback, net_log);
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::OK, rv);
-
-  const net::HttpResponseInfo* response = trans->GetResponseInfo();
-  ASSERT_TRUE(response);
-
-  if (response_info)
-    *response_info = *response;
-
-  ReadAndVerifyTransaction(trans.get(), trans_info);
+MockDiskEntry::MockDiskEntry(const std::string& key)
+    : key_(key), doomed_(false), sparse_(false),
+      fail_requests_(false), busy_(false), delayed_(false) {
+  test_mode_ = GetTestModeForEntry(key);
 }
 
-void RunTransactionTestWithRequest(net::HttpCache* cache,
-                                   const MockTransaction& trans_info,
-                                   const MockHttpRequest& request,
-                                   net::HttpResponseInfo* response_info) {
-  RunTransactionTestWithRequestAndLog(cache, trans_info, request,
-                                      response_info, net::BoundNetLog());
+void MockDiskEntry::Doom() {
+  doomed_ = true;
 }
 
-void RunTransactionTestWithLog(net::HttpCache* cache,
-                               const MockTransaction& trans_info,
-                               const net::BoundNetLog& log) {
-  RunTransactionTestWithRequestAndLog(
-      cache, trans_info, MockHttpRequest(trans_info), NULL, log);
+void MockDiskEntry::Close() {
+  Release();
 }
 
-void RunTransactionTest(net::HttpCache* cache,
-                        const MockTransaction& trans_info) {
-  RunTransactionTestWithLog(cache, trans_info, net::BoundNetLog());
+std::string MockDiskEntry::GetKey() const {
+  if (fail_requests_)
+    return std::string();
+  return key_;
 }
 
-void RunTransactionTestWithResponseInfo(net::HttpCache* cache,
-                                        const MockTransaction& trans_info,
-                                        net::HttpResponseInfo* response) {
-  RunTransactionTestWithRequest(
-      cache, trans_info, MockHttpRequest(trans_info), response);
+base::Time MockDiskEntry::GetLastUsed() const {
+  return base::Time::FromInternalValue(0);
 }
 
-void RunTransactionTestWithResponse(net::HttpCache* cache,
-                                    const MockTransaction& trans_info,
-                                    std::string* response_headers) {
-  net::HttpResponseInfo response;
-  RunTransactionTestWithResponseInfo(cache, trans_info, &response);
-  response.headers->GetNormalizedHeaders(response_headers);
+base::Time MockDiskEntry::GetLastModified() const {
+  return base::Time::FromInternalValue(0);
 }
 
-// This class provides a handler for kFastNoStoreGET_Transaction so that the
-// no-store header can be included on demand.
-class FastTransactionServer {
- public:
-  FastTransactionServer() {
-    no_store = false;
-  }
-  ~FastTransactionServer() {}
-
-  void set_no_store(bool value) { no_store = value; }
-
-  static void FastNoStoreHandler(const net::HttpRequestInfo* request,
-                                 std::string* response_status,
-                                 std::string* response_headers,
-                                 std::string* response_data) {
-    if (no_store)
-      *response_headers = "Cache-Control: no-store\n";
-  }
-
- private:
-  static bool no_store;
-  DISALLOW_COPY_AND_ASSIGN(FastTransactionServer);
-};
-bool FastTransactionServer::no_store;
-
-const MockTransaction kFastNoStoreGET_Transaction = {
-  "http://www.google.com/nostore",
-  "GET",
-  base::Time(),
-  "",
-  net::LOAD_VALIDATE_CACHE,
-  "HTTP/1.1 200 OK",
-  "Cache-Control: max-age=10000\n",
-  base::Time(),
-  "<html><body>Google Blah Blah</body></html>",
-  TEST_MODE_SYNC_NET_START,
-  &FastTransactionServer::FastNoStoreHandler,
-  0
-};
-
-// This class provides a handler for kRangeGET_TransactionOK so that the range
-// request can be served on demand.
-class RangeTransactionServer {
- public:
-  RangeTransactionServer() {
-    not_modified_ = false;
-    modified_ = false;
-    bad_200_ = false;
-  }
-  ~RangeTransactionServer() {
-    not_modified_ = false;
-    modified_ = false;
-    bad_200_ = false;
-  }
-
-  // Returns only 416 or 304 when set.
-  void set_not_modified(bool value) { not_modified_ = value; }
-
-  // Returns 206 when revalidating a range (instead of 304).
-  void set_modified(bool value) { modified_ = value; }
-
-  // Returns 200 instead of 206 (a malformed response overall).
-  void set_bad_200(bool value) { bad_200_ = value; }
-
-  static void RangeHandler(const net::HttpRequestInfo* request,
-                           std::string* response_status,
-                           std::string* response_headers,
-                           std::string* response_data);
-
- private:
-  static bool not_modified_;
-  static bool modified_;
-  static bool bad_200_;
-  DISALLOW_COPY_AND_ASSIGN(RangeTransactionServer);
-};
-bool RangeTransactionServer::not_modified_ = false;
-bool RangeTransactionServer::modified_ = false;
-bool RangeTransactionServer::bad_200_ = false;
-
-// A dummy extra header that must be preserved on a given request.
-#define EXTRA_HEADER "Extra: header"
-static const char kExtraHeaderKey[] = "Extra";
-
-// Static.
-void RangeTransactionServer::RangeHandler(const net::HttpRequestInfo* request,
-                                          std::string* response_status,
-                                          std::string* response_headers,
-                                          std::string* response_data) {
-  if (request->extra_headers.IsEmpty()) {
-    response_status->assign("HTTP/1.1 416 Requested Range Not Satisfiable");
-    response_data->clear();
-    return;
-  }
-
-  // We want to make sure we don't delete extra headers.
-  EXPECT_TRUE(request->extra_headers.HasHeader(kExtraHeaderKey));
-
-  if (not_modified_) {
-    response_status->assign("HTTP/1.1 304 Not Modified");
-    response_data->clear();
-    return;
-  }
-
-  std::vector<net::HttpByteRange> ranges;
-  std::string range_header;
-  if (!request->extra_headers.GetHeader(
-          net::HttpRequestHeaders::kRange, &range_header) ||
-      !net::HttpUtil::ParseRangeHeader(range_header, &ranges) || bad_200_ ||
-      ranges.size() != 1) {
-    // This is not a byte range request. We return 200.
-    response_status->assign("HTTP/1.1 200 OK");
-    response_headers->assign("Date: Wed, 28 Nov 2007 09:40:09 GMT");
-    response_data->assign("Not a range");
-    return;
-  }
-
-  // We can handle this range request.
-  net::HttpByteRange byte_range = ranges[0];
-  if (byte_range.first_byte_position() > 79) {
-    response_status->assign("HTTP/1.1 416 Requested Range Not Satisfiable");
-    response_data->clear();
-    return;
-  }
-
-  EXPECT_TRUE(byte_range.ComputeBounds(80));
-  int start = static_cast<int>(byte_range.first_byte_position());
-  int end = static_cast<int>(byte_range.last_byte_position());
-
-  EXPECT_LT(end, 80);
-
-  std::string content_range = base::StringPrintf(
-      "Content-Range: bytes %d-%d/80\n", start, end);
-  response_headers->append(content_range);
-
-  if (!request->extra_headers.HasHeader("If-None-Match") || modified_) {
-    std::string data;
-    if (end == start) {
-      EXPECT_EQ(0, end % 10);
-      data = "r";
-    } else {
-      EXPECT_EQ(9, (end - start) % 10);
-      for (int block_start = start; block_start < end; block_start += 10) {
-        base::StringAppendF(&data, "rg: %02d-%02d ",
-                            block_start, block_start + 9);
-      }
-    }
-    *response_data = data;
-
-    if (end - start != 9) {
-      // We also have to fix content-length.
-      int len = end - start + 1;
-      std::string content_length = base::StringPrintf("Content-Length: %d\n",
-                                                      len);
-      response_headers->replace(response_headers->find("Content-Length:"),
-                                content_length.size(), content_length);
-    }
-  } else {
-    response_status->assign("HTTP/1.1 304 Not Modified");
-    response_data->clear();
-  }
+int32 MockDiskEntry::GetDataSize(int index) const {
+  DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
+  return static_cast<int32>(data_[index].size());
 }
 
-const MockTransaction kRangeGET_TransactionOK = {
-  "http://www.google.com/range",
-  "GET",
-  base::Time(),
-  "Range: bytes = 40-49\r\n"
-  EXTRA_HEADER,
-  net::LOAD_NORMAL,
-  "HTTP/1.1 206 Partial Content",
-  "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
-  "ETag: \"foo\"\n"
-  "Accept-Ranges: bytes\n"
-  "Content-Length: 10\n",
-  base::Time(),
-  "rg: 40-49 ",
-  TEST_MODE_NORMAL,
-  &RangeTransactionServer::RangeHandler,
-  0
-};
+int MockDiskEntry::ReadData(int index, int offset, net::IOBuffer* buf,
+                            int buf_len, net::OldCompletionCallback* callback) {
+  DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
+  DCHECK(callback);
 
-// Verifies the response headers (|response|) match a partial content
-// response for the range starting at |start| and ending at |end|.
-void Verify206Response(std::string response, int start, int end) {
-  std::string raw_headers(net::HttpUtil::AssembleRawHeaders(response.data(),
-                                                            response.size()));
-  scoped_refptr<net::HttpResponseHeaders> headers(
-      new net::HttpResponseHeaders(raw_headers));
+  if (fail_requests_)
+    return net::ERR_CACHE_READ_FAILURE;
 
-  ASSERT_EQ(206, headers->response_code());
+  if (offset < 0 || offset > static_cast<int>(data_[index].size()))
+    return net::ERR_FAILED;
+  if (static_cast<size_t>(offset) == data_[index].size())
+    return 0;
 
-  int64 range_start, range_end, object_size;
-  ASSERT_TRUE(
-      headers->GetContentRange(&range_start, &range_end, &object_size));
-  int64 content_length = headers->GetContentLength();
+  int num = std::min(buf_len, static_cast<int>(data_[index].size()) - offset);
+  memcpy(buf->data(), &data_[index][offset], num);
 
-  int length = end - start + 1;
-  ASSERT_EQ(length, content_length);
-  ASSERT_EQ(start, range_start);
-  ASSERT_EQ(end, range_end);
-}
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
+    return num;
 
-// Creates a truncated entry that can be resumed using byte ranges.
-void CreateTruncatedEntry(std::string raw_headers, MockHttpCache* cache) {
-  // Create a disk cache entry that stores an incomplete resource.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache->CreateBackendEntry(kRangeGET_TransactionOK.url, &entry,
-                                        NULL));
-
-  raw_headers = net::HttpUtil::AssembleRawHeaders(raw_headers.data(),
-                                                  raw_headers.size());
-
-  net::HttpResponseInfo response;
-  response.response_time = base::Time::Now();
-  response.request_time = base::Time::Now();
-  response.headers = new net::HttpResponseHeaders(raw_headers);
-  // Set the last argument for this to be an incomplete request.
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, true));
-
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(100));
-  int len = static_cast<int>(base::strlcpy(buf->data(),
-                                           "rg: 00-09 rg: 10-19 ", 100));
-  TestOldCompletionCallback cb;
-  int rv = entry->WriteData(1, 0, buf, len, &cb, true);
-  EXPECT_EQ(len, cb.GetResult(rv));
-  entry->Close();
+  CallbackLater(callback, num);
+  return net::ERR_IO_PENDING;
 }
 
-// Helper to represent a network HTTP response.
-struct Response {
-  // Set this response into |trans|.
-  void AssignTo(MockTransaction* trans) const {
-    trans->status = status;
-    trans->response_headers = headers;
-    trans->data = body;
-  }
+int MockDiskEntry::WriteData(int index, int offset, net::IOBuffer* buf,
+                             int buf_len, net::OldCompletionCallback* callback,
+                             bool truncate) {
+  DCHECK(index >= 0 && index < kNumCacheEntryDataIndices);
+  DCHECK(callback);
+  DCHECK(truncate);
 
-  std::string status_and_headers() const {
-    return std::string(status) + "\n" + std::string(headers);
+  if (fail_requests_) {
+    CallbackLater(callback, net::ERR_CACHE_READ_FAILURE);
+    return net::ERR_IO_PENDING;
   }
 
-  const char* status;
-  const char* headers;
-  const char* body;
-};
+  if (offset < 0 || offset > static_cast<int>(data_[index].size()))
+    return net::ERR_FAILED;
 
-struct Context {
-  Context() : result(net::ERR_IO_PENDING) {}
+  data_[index].resize(offset + buf_len);
+  if (buf_len)
+    memcpy(&data_[index][offset], buf->data(), buf_len);
 
-  int result;
-  TestOldCompletionCallback callback;
-  scoped_ptr<net::HttpTransaction> trans;
-};
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
+    return buf_len;
 
-}  // namespace
-
-
-//-----------------------------------------------------------------------------
-// HttpCache tests
-
-TEST(HttpCache, CreateThenDestroy) {
-  MockHttpCache cache;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
+  CallbackLater(callback, buf_len);
+  return net::ERR_IO_PENDING;
 }
 
-TEST(HttpCache, GetBackend) {
-  MockHttpCache cache(net::HttpCache::DefaultBackend::InMemory(0));
+int MockDiskEntry::ReadSparseData(int64 offset, net::IOBuffer* buf, int buf_len,
+                                  net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  if (!sparse_ || busy_)
+    return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
+  if (offset < 0)
+    return net::ERR_FAILED;
 
-  disk_cache::Backend* backend;
-  TestOldCompletionCallback cb;
-  // This will lazily initialize the backend.
-  int rv = cache.http_cache()->GetBackend(&backend, &cb);
-  EXPECT_EQ(net::OK, cb.GetResult(rv));
-}
+  if (fail_requests_)
+    return net::ERR_CACHE_READ_FAILURE;
 
-TEST(HttpCache, SimpleGET) {
-  MockHttpCache cache;
+  DCHECK(offset < kint32max);
+  int real_offset = static_cast<int>(offset);
+  if (!buf_len)
+    return 0;
 
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
+  int num = std::min(static_cast<int>(data_[1].size()) - real_offset,
+                     buf_len);
+  memcpy(buf->data(), &data_[1][real_offset], num);
 
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
+    return num;
 
-TEST(HttpCache, SimpleGETNoDiskCache) {
-  MockHttpCache cache;
-
-  cache.disk_cache()->set_fail_requests();
-
-  net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded);
-  log.SetLogLevel(net::NetLog::LOG_BASIC);
-
-  // Read from the network, and don't use the cache.
-  RunTransactionTestWithLog(cache.http_cache(), kSimpleGET_Transaction,
-                            log.bound());
-
-  // Check that the NetLog was filled as expected.
-  // (We attempted to both Open and Create entries, but both failed).
-  net::CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(6u, entries.size());
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 0, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 1, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 2, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 3, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 4, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 5, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
+  CallbackLater(callback, num);
+  busy_ = true;
+  delayed_ = false;
+  return net::ERR_IO_PENDING;
 }
 
-TEST(HttpCache, SimpleGETNoDiskCache2) {
-  // This will initialize a cache object with NULL backend.
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  factory->set_fail(true);
-  factory->FinishCreation();  // We'll complete synchronously.
-  MockHttpCache cache(factory);
+int MockDiskEntry::WriteSparseData(int64 offset, net::IOBuffer* buf,
+                                   int buf_len,
+                                   net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  if (busy_)
+    return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
+  if (!sparse_) {
+    if (data_[1].size())
+      return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
+    sparse_ = true;
+  }
+  if (offset < 0)
+    return net::ERR_FAILED;
+  if (!buf_len)
+    return 0;
 
-  // Read from the network, and don't use the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
+  if (fail_requests_)
+    return net::ERR_CACHE_READ_FAILURE;
 
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_FALSE(cache.http_cache()->GetCurrentBackend());
-}
+  DCHECK(offset < kint32max);
+  int real_offset = static_cast<int>(offset);
 
-TEST(HttpCache, SimpleGETWithDiskFailures) {
-  MockHttpCache cache;
+  if (static_cast<int>(data_[1].size()) < real_offset + buf_len)
+    data_[1].resize(real_offset + buf_len);
 
-  cache.disk_cache()->set_soft_failures(true);
+  memcpy(&data_[1][real_offset], buf->data(), buf_len);
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
+    return buf_len;
 
-  // Read from the network, and fail to write to the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // This one should see an empty cache again.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+  CallbackLater(callback, buf_len);
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that disk failures after the transaction has started don't cause the
-// request to fail.
-TEST(HttpCache, SimpleGETWithDiskFailures2) {
-  MockHttpCache cache;
+int MockDiskEntry::GetAvailableRange(int64 offset, int len, int64* start,
+                                     net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  if (!sparse_ || busy_)
+    return net::ERR_CACHE_OPERATION_NOT_SUPPORTED;
+  if (offset < 0)
+    return net::ERR_FAILED;
 
-  MockHttpRequest request(kSimpleGET_Transaction);
+  if (fail_requests_)
+    return net::ERR_CACHE_READ_FAILURE;
 
-  scoped_ptr<Context> c(new Context());
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
+  *start = offset;
+  DCHECK(offset < kint32max);
+  int real_offset = static_cast<int>(offset);
+  if (static_cast<int>(data_[1].size()) < real_offset)
+    return 0;
 
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-  rv = c->callback.WaitForResult();
+  int num = std::min(static_cast<int>(data_[1].size()) - real_offset, len);
+  int count = 0;
+  for (; num > 0; num--, real_offset++) {
+    if (!count) {
+      if (data_[1][real_offset]) {
+        count++;
+        *start = real_offset;
+      }
+    } else {
+      if (!data_[1][real_offset])
+        break;
+      count++;
+    }
+  }
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_WRITE)
+    return count;
 
-  // Start failing request now.
-  cache.disk_cache()->set_soft_failures(true);
-
-  // We have to open the entry again to propagate the failure flag.
-  disk_cache::Entry* en;
-  ASSERT_TRUE(cache.OpenBackendEntry(kSimpleGET_Transaction.url, &en));
-  en->Close();
-
-  ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  c.reset();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // This one should see an empty cache again.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+  CallbackLater(callback, count);
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that we don't crash after failures to read from the cache.
-TEST(HttpCache, SimpleGETWithDiskFailures3) {
-  MockHttpCache cache;
-
-  // Read from the network, and write to the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  cache.disk_cache()->set_soft_failures(true);
-
-  // Now fail to read from the cache.
-  scoped_ptr<Context> c(new Context());
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::ERR_CACHE_READ_FAILURE, c->callback.GetResult(rv));
+bool MockDiskEntry::CouldBeSparse() const {
+  return sparse_;
 }
 
-TEST(HttpCache, SimpleGET_LoadOnlyFromCache_Hit) {
-  MockHttpCache cache;
-
-  net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded);
-
-  // This prevents a number of write events from being logged.
-  log.SetLogLevel(net::NetLog::LOG_BASIC);
-
-  // write to the cache
-  RunTransactionTestWithLog(cache.http_cache(), kSimpleGET_Transaction,
-                            log.bound());
-
-  // Check that the NetLog was filled as expected.
-  net::CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(8u, entries.size());
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 0, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 1, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 2, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 3, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 4, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 5, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 6, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 7, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-
-  // force this transaction to read from the cache
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-
-  log.Clear();
-
-  RunTransactionTestWithLog(cache.http_cache(), transaction, log.bound());
-
-  // Check that the NetLog was filled as expected.
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(8u, entries.size());
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 0, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 1, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 2, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 3, net::NetLog::TYPE_HTTP_CACHE_OPEN_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 4, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 5, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 6, net::NetLog::TYPE_HTTP_CACHE_READ_INFO));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 7, net::NetLog::TYPE_HTTP_CACHE_READ_INFO));
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+void MockDiskEntry::CancelSparseIO() {
+  cancel_ = true;
 }
 
-TEST(HttpCache, SimpleGET_LoadOnlyFromCache_Miss) {
-  MockHttpCache cache;
+int MockDiskEntry::ReadyForSparseIO(net::OldCompletionCallback* callback) {
+  if (!cancel_)
+    return net::OK;
 
-  // force this transaction to read from the cache
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_ONLY_FROM_CACHE;
+  cancel_ = false;
+  DCHECK(callback);
+  if (MockHttpCache::GetTestMode(test_mode_) & TEST_MODE_SYNC_CACHE_READ)
+    return net::OK;
 
-  MockHttpRequest request(transaction);
-  TestOldCompletionCallback callback;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
-
-  rv = trans->Start(&request, &callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::ERR_CACHE_MISS, rv);
-
-  trans.reset();
-
-  EXPECT_EQ(0, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
+  // The pending operation is already in the message loop (and hopefuly
+  // already in the second pass).  Just notify the caller that it finished.
+  CallbackLater(callback, 0);
+  return net::ERR_IO_PENDING;
 }
 
-TEST(HttpCache, SimpleGET_LoadPreferringCache_Hit) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // force this transaction to read from the cache if valid
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_PREFERRING_CACHE;
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+// If |value| is true, don't deliver any completion callbacks until called
+// again with |value| set to false.  Caution: remember to enable callbacks
+// again or all subsequent tests will fail.
+// Static.
+void MockDiskEntry::IgnoreCallbacks(bool value) {
+  if (ignore_callbacks_ == value)
+    return;
+  ignore_callbacks_ = value;
+  if (!value)
+    StoreAndDeliverCallbacks(false, NULL, NULL, 0);
 }
 
-TEST(HttpCache, SimpleGET_LoadPreferringCache_Miss) {
-  MockHttpCache cache;
-
-  // force this transaction to read from the cache if valid
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_PREFERRING_CACHE;
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+MockDiskEntry::~MockDiskEntry() {
 }
 
-TEST(HttpCache, SimpleGET_LoadBypassCache) {
-  MockHttpCache cache;
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // Force this transaction to write to the cache again.
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_BYPASS_CACHE;
-
-  net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded);
-
-  // This prevents a number of write events from being logged.
-  log.SetLogLevel(net::NetLog::LOG_BASIC);
-
-  RunTransactionTestWithLog(cache.http_cache(), transaction, log.bound());
-
-  // Check that the NetLog was filled as expected.
-  net::CapturingNetLog::EntryList entries;
-  log.GetEntries(&entries);
-
-  EXPECT_EQ(8u, entries.size());
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 0, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 1, net::NetLog::TYPE_HTTP_CACHE_GET_BACKEND));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 2, net::NetLog::TYPE_HTTP_CACHE_DOOM_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 3, net::NetLog::TYPE_HTTP_CACHE_DOOM_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 4, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 5, net::NetLog::TYPE_HTTP_CACHE_CREATE_ENTRY));
-  EXPECT_TRUE(net::LogContainsBeginEvent(
-      entries, 6, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-  EXPECT_TRUE(net::LogContainsEndEvent(
-      entries, 7, net::NetLog::TYPE_HTTP_CACHE_ADD_TO_ENTRY));
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+// Unlike the callbacks for MockHttpTransaction, we want this one to run even
+// if the consumer called Close on the MockDiskEntry.  We achieve that by
+// leveraging the fact that this class is reference counted.
+void MockDiskEntry::CallbackLater(net::OldCompletionCallback* callback,
+                                  int result) {
+  if (ignore_callbacks_)
+    return StoreAndDeliverCallbacks(true, this, callback, result);
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
+      &MockDiskEntry::RunCallback, this, callback, result));
 }
 
-TEST(HttpCache, SimpleGET_LoadBypassCache_Implicit) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // force this transaction to write to the cache again
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.request_headers = "pragma: no-cache";
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, SimpleGET_LoadBypassCache_Implicit2) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // force this transaction to write to the cache again
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.request_headers = "cache-control: no-cache";
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, SimpleGET_LoadValidateCache) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // read from the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // force this transaction to validate the cache
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, SimpleGET_LoadValidateCache_Implicit) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // read from the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // force this transaction to validate the cache
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.request_headers = "cache-control: max-age=0";
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-static void PreserveRequestHeaders_Handler(
-    const net::HttpRequestInfo* request,
-    std::string* response_status,
-    std::string* response_headers,
-    std::string* response_data) {
-  EXPECT_TRUE(request->extra_headers.HasHeader(kExtraHeaderKey));
-}
-
-// Tests that we don't remove extra headers for simple requests.
-TEST(HttpCache, SimpleGET_PreserveRequestHeaders) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.handler = PreserveRequestHeaders_Handler;
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.response_headers = "Cache-Control: max-age=0\n";
-  AddMockTransaction(&transaction);
-
-  // Write, then revalidate the entry.
-  RunTransactionTest(cache.http_cache(), transaction);
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we don't remove extra headers for conditionalized requests.
-TEST(HttpCache, ConditionalizedGET_PreserveRequestHeaders) {
-  MockHttpCache cache;
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), kETagGET_Transaction);
-
-  MockTransaction transaction(kETagGET_Transaction);
-  transaction.handler = PreserveRequestHeaders_Handler;
-  transaction.request_headers = "If-None-Match: \"foopy\"\r\n"
-                                EXTRA_HEADER;
-  AddMockTransaction(&transaction);
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-}
-
-TEST(HttpCache, SimpleGET_ManyReaders) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 5;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-    EXPECT_EQ(net::LOAD_STATE_IDLE, c->trans->GetLoadState());
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  }
-
-  // All requests are waiting for the active entry.
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    EXPECT_EQ(net::LOAD_STATE_WAITING_FOR_CACHE, c->trans->GetLoadState());
-  }
-
-  // Allow all requests to move from the Create queue to the active entry.
-  MessageLoop::current()->RunAllPending();
-
-  // The first request should be a writer at this point, and the subsequent
-  // requests should be pending.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // All requests depend on the writer, and the writer is between Start and
-  // Read, i.e. idle.
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    EXPECT_EQ(net::LOAD_STATE_IDLE, c->trans->GetLoadState());
-  }
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    if (c->result == net::ERR_IO_PENDING)
-      c->result = c->callback.WaitForResult();
-    ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  }
-
-  // We should not have had to re-open the disk entry
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    delete c;
-  }
-}
-
-// This is a test for http://code.google.com/p/chromium/issues/detail?id=4769.
-// If cancelling a request is racing with another request for the same resource
-// finishing, we have to make sure that we remove both transactions from the
-// entry.
-TEST(HttpCache, SimpleGET_RacingReaders) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-  MockHttpRequest reader_request(kSimpleGET_Transaction);
-  reader_request.load_flags = net::LOAD_ONLY_FROM_CACHE;
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 5;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    MockHttpRequest* this_request = &request;
-    if (i == 1 || i == 2)
-      this_request = &reader_request;
-
-    c->result = c->trans->Start(this_request, &c->callback, net::BoundNetLog());
-  }
-
-  // Allow all requests to move from the Create queue to the active entry.
-  MessageLoop::current()->RunAllPending();
-
-  // The first request should be a writer at this point, and the subsequent
-  // requests should be pending.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  Context* c = context_list[0];
-  ASSERT_EQ(net::ERR_IO_PENDING, c->result);
-  c->result = c->callback.WaitForResult();
-  ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-
-  // Now we have 2 active readers and two queued transactions.
-
-  EXPECT_EQ(net::LOAD_STATE_IDLE,
-            context_list[2]->trans->GetLoadState());
-  EXPECT_EQ(net::LOAD_STATE_WAITING_FOR_CACHE,
-            context_list[3]->trans->GetLoadState());
-
-  c = context_list[1];
-  ASSERT_EQ(net::ERR_IO_PENDING, c->result);
-  c->result = c->callback.WaitForResult();
-  if (c->result == net::OK)
-    ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-
-  // At this point we have one reader, two pending transactions and a task on
-  // the queue to move to the next transaction. Now we cancel the request that
-  // is the current reader, and expect the queued task to be able to start the
-  // next request.
-
-  c = context_list[2];
-  c->trans.reset();
-
-  for (int i = 3; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    if (c->result == net::ERR_IO_PENDING)
-      c->result = c->callback.WaitForResult();
-    if (c->result == net::OK)
-      ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  }
-
-  // We should not have had to re-open the disk entry.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    delete c;
-  }
-}
-
-// Tests that we can doom an entry with pending transactions and delete one of
-// the pending transactions before the first one completes.
-// See http://code.google.com/p/chromium/issues/detail?id=25588
-TEST(HttpCache, SimpleGET_DoomWithPending) {
-  // We need simultaneous doomed / not_doomed entries so let's use a real cache.
-  MockHttpCache cache(net::HttpCache::DefaultBackend::InMemory(1024 * 1024));
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-  MockHttpRequest writer_request(kSimpleGET_Transaction);
-  writer_request.load_flags = net::LOAD_BYPASS_CACHE;
-
-  ScopedVector<Context> context_list;
-  const int kNumTransactions = 4;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    MockHttpRequest* this_request = &request;
-    if (i == 3)
-      this_request = &writer_request;
-
-    c->result = c->trans->Start(this_request, &c->callback, net::BoundNetLog());
-  }
-
-  // The first request should be a writer at this point, and the two subsequent
-  // requests should be pending. The last request doomed the first entry.
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-
-  // Cancel the first queued transaction.
-  delete context_list[1];
-  context_list.get()[1] = NULL;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    if (i == 1)
-      continue;
-    Context* c = context_list[i];
-    ASSERT_EQ(net::ERR_IO_PENDING, c->result);
-    c->result = c->callback.WaitForResult();
-    ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  }
-}
-
-// This is a test for http://code.google.com/p/chromium/issues/detail?id=4731.
-// We may attempt to delete an entry synchronously with the act of adding a new
-// transaction to said entry.
-TEST(HttpCache, FastNoStoreGET_DoneWithPending) {
-  MockHttpCache cache;
-
-  // The headers will be served right from the call to Start() the request.
-  MockHttpRequest request(kFastNoStoreGET_Transaction);
-  FastTransactionServer request_handler;
-  AddMockTransaction(&kFastNoStoreGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 3;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  }
-
-  // Allow all requests to move from the Create queue to the active entry.
-  MessageLoop::current()->RunAllPending();
-
-  // The first request should be a writer at this point, and the subsequent
-  // requests should be pending.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Now, make sure that the second request asks for the entry not to be stored.
-  request_handler.set_no_store(true);
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    if (c->result == net::ERR_IO_PENDING)
-      c->result = c->callback.WaitForResult();
-    ReadAndVerifyTransaction(c->trans.get(), kFastNoStoreGET_Transaction);
-    delete c;
-  }
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kFastNoStoreGET_Transaction);
-}
-
-TEST(HttpCache, SimpleGET_ManyWriters_CancelFirst) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 2;
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  }
-
-  // Allow all requests to move from the Create queue to the active entry.
-  MessageLoop::current()->RunAllPending();
-
-  // The first request should be a writer at this point, and the subsequent
-  // requests should be pending.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    if (c->result == net::ERR_IO_PENDING)
-      c->result = c->callback.WaitForResult();
-    // Destroy only the first transaction.
-    if (i == 0) {
-      delete c;
-      context_list[i] = NULL;
+void MockDiskEntry::RunCallback(net::OldCompletionCallback* callback, int result) {

[gavinp, 2011/11/18 14:26:22]

80 chars.

[rvargas (doing something else), 2011/11/18 19:24:58]

This will go away when OldCompletionCallback is replaced with CompletionCallback
(the first part of that change didn't fix formatting)

[gavinp, 2011/11/22 18:33:48]

SGTM!  Just CC me or add me as a reviewer when that comes down the line, please.

On 2011/11/18 19:24:58, rvargas wrote:

[rvargas (doing something else), 2011/11/22 18:58:10]

I'm not the one working on that change. Will is doing that, and I have no idea
when he plans on going back to the old name, I just know that he intentionally
didn't fix the line overflows because find/replace was going to fix that at some
point.

On 2011/11/22 18:33:48, gavinp wrote:

+  if (busy_) {
+    // This is kind of hacky, but controlling the behavior of just this entry
+    // from a test is sort of complicated.  What we really want to do is
+    // delay the delivery of a sparse IO operation a little more so that the
+    // request start operation (async) will finish without seeing the end of
+    // this operation (already posted to the message loop)... and without
+    // just delaying for n mS (which may cause trouble with slow bots).  So
+    // we re-post this operation (all async sparse IO operations will take two
+    // trips trhough the message loop instead of one).
+    if (!delayed_) {
+      delayed_ = true;
+      return CallbackLater(callback, result);
     }
   }
-
-  // Complete the rest of the transactions.
-  for (int i = 1; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  }
-
-  // We should have had to re-open the disk entry.
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  for (int i = 1; i < kNumTransactions; ++i) {
-    Context* c = context_list[i];
-    delete c;
-  }
+  busy_ = false;
+  callback->Run(result);
 }
 
-// Tests that we can cancel requests that are queued waiting to open the disk
-// cache entry.
-TEST(HttpCache, SimpleGET_ManyWriters_CancelCreate) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 5;
-
-  for (int i = 0; i < kNumTransactions; i++) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  }
-
-  // The first request should be creating the disk cache entry and the others
-  // should be pending.
-
-  EXPECT_EQ(0, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Cancel a request from the pending queue.
-  delete context_list[3];
-  context_list[3] = NULL;
-
-  // Cancel the request that is creating the entry. This will force the pending
-  // operations to restart.
-  delete context_list[0];
-  context_list[0] = NULL;
-
-  // Complete the rest of the transactions.
-  for (int i = 1; i < kNumTransactions; i++) {
-    Context* c = context_list[i];
-    if (c) {
-      c->result = c->callback.GetResult(c->result);
-      ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
+// When |store| is true, stores the callback to be delivered later; otherwise
+// delivers any callback previously stored.
+// Static.
+void MockDiskEntry::StoreAndDeliverCallbacks(bool store, MockDiskEntry* entry,
+                                             net::OldCompletionCallback* callback,

[gavinp, 2011/11/18 14:26:22]

80 chars.

+                                             int result) {
+  static std::vector<CallbackInfo> callback_list;
+  if (store) {
+    CallbackInfo c = {entry, callback, result};
+    callback_list.push_back(c);
+  } else {
+    for (size_t i = 0; i < callback_list.size(); i++) {
+      CallbackInfo& c = callback_list[i];
+      c.entry->CallbackLater(c.callback, c.result);
     }
+    callback_list.clear();
   }
-
-  // We should have had to re-create the disk entry.
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  for (int i = 1; i < kNumTransactions; ++i) {
-    delete context_list[i];
-  }
 }
 
-// Tests that we can cancel a single request to open a disk cache entry.
-TEST(HttpCache, SimpleGET_CancelCreate) {
-  MockHttpCache cache;
+// Statics.
+bool MockDiskEntry::cancel_ = false;
+bool MockDiskEntry::ignore_callbacks_ = false;
 
-  MockHttpRequest request(kSimpleGET_Transaction);
+//-----------------------------------------------------------------------------
 
-  Context* c = new Context();
-
-  c->result = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, c->result);
-
-  c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::ERR_IO_PENDING, c->result);
-
-  // Release the reference that the mock disk cache keeps for this entry, so
-  // that we test that the http cache handles the cancelation correctly.
-  cache.disk_cache()->ReleaseAll();
-  delete c;
-
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-// Tests that we delete/create entries even if multiple requests are queued.
-TEST(HttpCache, SimpleGET_ManyWriters_BypassCache) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-  request.load_flags = net::LOAD_BYPASS_CACHE;
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 5;
-
-  for (int i = 0; i < kNumTransactions; i++) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
+class MockDiskCache::CallbackRunner : public Task {
+ public:
+  CallbackRunner(net::OldCompletionCallback* callback, int result)
+      : callback_(callback), result_(result) {}
+  virtual void Run() {
+    callback_->Run(result_);
   }
 
-  // The first request should be deleting the disk cache entry and the others
-  // should be pending.
+ private:
+  net::OldCompletionCallback* callback_;
+  int result_;
+  DISALLOW_COPY_AND_ASSIGN(CallbackRunner);
+};
 
-  EXPECT_EQ(0, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  // Complete the transactions.
-  for (int i = 0; i < kNumTransactions; i++) {
-    Context* c = context_list[i];
-    c->result = c->callback.GetResult(c->result);
-    ReadAndVerifyTransaction(c->trans.get(), kSimpleGET_Transaction);
-  }
-
-  // We should have had to re-create the disk entry multiple times.
-
-  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];
-  }
+MockDiskCache::MockDiskCache()
+    : open_count_(0), create_count_(0), fail_requests_(false),
+      soft_failures_(false) {
 }
 
-TEST(HttpCache, SimpleGET_AbandonedCacheRead) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-  TestOldCompletionCallback callback;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  rv = trans->Start(&request, &callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::OK, rv);
-
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(256));
-  rv = trans->Read(buf, 256, &callback);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  // Test that destroying the transaction while it is reading from the cache
-  // works properly.
-  trans.reset();
-
-  // Make sure we pump any pending events, which should include a call to
-  // HttpCache::Transaction::OnCacheReadCompleted.
-  MessageLoop::current()->RunAllPending();
+MockDiskCache::~MockDiskCache() {
+  ReleaseAll();
 }
 
-// Tests that we can delete the HttpCache and deal with queued transactions
-// ("waiting for the backend" as opposed to Active or Doomed entries).
-TEST(HttpCache, SimpleGET_ManyWriters_DeleteCache) {
-  scoped_ptr<MockHttpCache> cache(new MockHttpCache(
-                                      new MockBackendNoCbFactory()));
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 5;
-
-  for (int i = 0; i < kNumTransactions; i++) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache->http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
-
-    c->result = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  }
-
-  // The first request should be creating the disk cache entry and the others
-  // should be pending.
-
-  EXPECT_EQ(0, cache->network_layer()->transaction_count());
-  EXPECT_EQ(0, cache->disk_cache()->open_count());
-  EXPECT_EQ(0, cache->disk_cache()->create_count());
-
-  cache.reset();
-
-  // There is not much to do with the transactions at this point... they are
-  // waiting for a callback that will not fire.
-  for (int i = 0; i < kNumTransactions; ++i) {
-    delete context_list[i];
-  }
+int32 MockDiskCache::GetEntryCount() const {
+  return static_cast<int32>(entries_.size());
 }
 
-// Tests that we queue requests when initializing the backend.
-TEST(HttpCache, SimpleGET_WaitForBackend) {
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  MockHttpCache cache(factory);
+int MockDiskCache::OpenEntry(const std::string& key, disk_cache::Entry** entry,
+                             net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  if (fail_requests_)
+    return net::ERR_CACHE_OPEN_FAILURE;
 
-  MockHttpRequest request0(kSimpleGET_Transaction);
-  MockHttpRequest request1(kTypicalGET_Transaction);
-  MockHttpRequest request2(kETagGET_Transaction);
+  EntryMap::iterator it = entries_.find(key);
+  if (it == entries_.end())
+    return net::ERR_CACHE_OPEN_FAILURE;
 
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 3;
-
-  for (int i = 0; i < kNumTransactions; i++) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
+  if (it->second->is_doomed()) {
+    it->second->Release();
+    entries_.erase(it);
+    return net::ERR_CACHE_OPEN_FAILURE;
   }
 
-  context_list[0]->result = context_list[0]->trans->Start(
-      &request0, &context_list[0]->callback, net::BoundNetLog());
-  context_list[1]->result = context_list[1]->trans->Start(
-      &request1, &context_list[1]->callback, net::BoundNetLog());
-  context_list[2]->result = context_list[2]->trans->Start(
-      &request2, &context_list[2]->callback, net::BoundNetLog());
+  open_count_++;
 
-  // Just to make sure that everything is still pending.
-  MessageLoop::current()->RunAllPending();
+  it->second->AddRef();
+  *entry = it->second;
 
-  // The first request should be creating the disk cache.
-  EXPECT_FALSE(context_list[0]->callback.have_result());
+  if (soft_failures_)
+    it->second->set_fail_requests();
 
-  factory->FinishCreation();
+  if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
+    return net::OK;
 
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(3, cache.disk_cache()->create_count());
-
-  for (int i = 0; i < kNumTransactions; ++i) {
-    EXPECT_TRUE(context_list[i]->callback.have_result());
-    delete context_list[i];
-  }
+  CallbackLater(callback, net::OK);
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that we can cancel requests that are queued waiting for the backend
-// to be initialized.
-TEST(HttpCache, SimpleGET_WaitForBackend_CancelCreate) {
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  MockHttpCache cache(factory);
+int MockDiskCache::CreateEntry(const std::string& key,
+                               disk_cache::Entry** entry,
+                               net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  if (fail_requests_)
+    return net::ERR_CACHE_CREATE_FAILURE;
 
-  MockHttpRequest request0(kSimpleGET_Transaction);
-  MockHttpRequest request1(kTypicalGET_Transaction);
-  MockHttpRequest request2(kETagGET_Transaction);
-
-  std::vector<Context*> context_list;
-  const int kNumTransactions = 3;
-
-  for (int i = 0; i < kNumTransactions; i++) {
-    context_list.push_back(new Context());
-    Context* c = context_list[i];
-
-    c->result = cache.http_cache()->CreateTransaction(&c->trans);
-    EXPECT_EQ(net::OK, c->result);
+  EntryMap::iterator it = entries_.find(key);
+  if (it != entries_.end()) {
+    DCHECK(it->second->is_doomed());
+    it->second->Release();
+    entries_.erase(it);
   }
 
-  context_list[0]->result = context_list[0]->trans->Start(
-      &request0, &context_list[0]->callback, net::BoundNetLog());
-  context_list[1]->result = context_list[1]->trans->Start(
-      &request1, &context_list[1]->callback, net::BoundNetLog());
-  context_list[2]->result = context_list[2]->trans->Start(
-      &request2, &context_list[2]->callback, net::BoundNetLog());
+  create_count_++;
 
-  // Just to make sure that everything is still pending.
-  MessageLoop::current()->RunAllPending();
+  MockDiskEntry* new_entry = new MockDiskEntry(key);
 
-  // The first request should be creating the disk cache.
-  EXPECT_FALSE(context_list[0]->callback.have_result());
+  new_entry->AddRef();
+  entries_[key] = new_entry;
 
-  // Cancel a request from the pending queue.
-  delete context_list[1];
-  context_list[1] = NULL;
+  new_entry->AddRef();
+  *entry = new_entry;
 
-  // Cancel the request that is creating the entry.
-  delete context_list[0];
-  context_list[0] = NULL;
+  if (soft_failures_)
+    new_entry->set_fail_requests();
 
-  // Complete the last transaction.
-  factory->FinishCreation();
+  if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
+    return net::OK;
 
-  context_list[2]->result =
-      context_list[2]->callback.GetResult(context_list[2]->result);
-  ReadAndVerifyTransaction(context_list[2]->trans.get(), kETagGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  delete context_list[2];
+  CallbackLater(callback, net::OK);
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that we can delete the cache while creating the backend.
-TEST(HttpCache, DeleteCacheWaitingForBackend) {
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  scoped_ptr<MockHttpCache> cache(new MockHttpCache(factory));
+int MockDiskCache::DoomEntry(const std::string& key,
+                             net::OldCompletionCallback* callback) {
+  DCHECK(callback);
+  EntryMap::iterator it = entries_.find(key);
+  if (it != entries_.end()) {
+    it->second->Release();
+    entries_.erase(it);
+  }
 
-  MockHttpRequest request(kSimpleGET_Transaction);
+  if (GetTestModeForEntry(key) & TEST_MODE_SYNC_CACHE_START)
+    return net::OK;
 
-  scoped_ptr<Context> c(new Context());
-  c->result = cache->http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, c->result);
-
-  c->trans->Start(&request, &c->callback, net::BoundNetLog());
-
-  // Just to make sure that everything is still pending.
-  MessageLoop::current()->RunAllPending();
-
-  // The request should be creating the disk cache.
-  EXPECT_FALSE(c->callback.have_result());
-
-  // We cannot call FinishCreation because the factory itself will go away with
-  // the cache, so grab the callback and attempt to use it.
-  net::OldCompletionCallback* callback = factory->callback();
-  disk_cache::Backend** backend = factory->backend();
-
-  cache.reset();
-  MessageLoop::current()->RunAllPending();
-
-  *backend = NULL;
-  callback->Run(net::ERR_ABORTED);
+  CallbackLater(callback, net::OK);
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that we can delete the cache while creating the backend, from within
-// one of the callbacks.
-TEST(HttpCache, DeleteCacheWaitingForBackend2) {
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  MockHttpCache* cache = new MockHttpCache(factory);
-
-  DeleteCacheOldCompletionCallback cb(cache);
-  disk_cache::Backend* backend;
-  int rv = cache->http_cache()->GetBackend(&backend, &cb);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  // Now let's queue a regular transaction
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  scoped_ptr<Context> c(new Context());
-  c->result = cache->http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, c->result);
-
-  c->trans->Start(&request, &c->callback, net::BoundNetLog());
-
-  // And another direct backend request.
-  TestOldCompletionCallback cb2;
-  rv = cache->http_cache()->GetBackend(&backend, &cb2);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  // Just to make sure that everything is still pending.
-  MessageLoop::current()->RunAllPending();
-
-  // The request should be queued.
-  EXPECT_FALSE(c->callback.have_result());
-
-  // Generate the callback.
-  factory->FinishCreation();
-  rv = cb.WaitForResult();
-
-  // The cache should be gone by now.
-  MessageLoop::current()->RunAllPending();
-  EXPECT_EQ(net::OK, c->callback.GetResult(c->result));
-  EXPECT_FALSE(cb2.have_result());
+int MockDiskCache::DoomAllEntries(net::OldCompletionCallback* callback) {
+  return net::ERR_NOT_IMPLEMENTED;
 }
 
-TEST(HttpCache, TypicalGET_ConditionalRequest) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kTypicalGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // get the same URL again, but this time we expect it to result
-  // in a conditional request.
-  RunTransactionTest(cache.http_cache(), kTypicalGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+int MockDiskCache::DoomEntriesBetween(const base::Time initial_time,
+                                      const base::Time end_time,
+                                      net::OldCompletionCallback* callback) {
+  return net::ERR_NOT_IMPLEMENTED;
 }
 
-static void ETagGet_ConditionalRequest_Handler(
-    const net::HttpRequestInfo* request,
-    std::string* response_status,
-    std::string* response_headers,
-    std::string* response_data) {
-  EXPECT_TRUE(
-      request->extra_headers.HasHeader(net::HttpRequestHeaders::kIfNoneMatch));
-  response_status->assign("HTTP/1.1 304 Not Modified");
-  response_headers->assign(kETagGET_Transaction.response_headers);
-  response_data->clear();
+int MockDiskCache::DoomEntriesSince(const base::Time initial_time,
+                                    net::OldCompletionCallback* callback) {
+  return net::ERR_NOT_IMPLEMENTED;
 }
 
-TEST(HttpCache, ETagGET_ConditionalRequest_304) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // get the same URL again, but this time we expect it to result
-  // in a conditional request.
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.handler = ETagGet_ConditionalRequest_Handler;
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+int MockDiskCache::OpenNextEntry(void** iter, disk_cache::Entry** next_entry,
+                                 net::OldCompletionCallback* callback) {
+  return net::ERR_NOT_IMPLEMENTED;
 }
 
-static void ETagGet_UnconditionalRequest_Handler(
-    const net::HttpRequestInfo* request,
-    std::string* response_status,
-    std::string* response_headers,
-    std::string* response_data) {
-  EXPECT_FALSE(
-      request->extra_headers.HasHeader(net::HttpRequestHeaders::kIfNoneMatch));
+void MockDiskCache::EndEnumeration(void** iter) {
 }
 
-TEST(HttpCache, ETagGET_Http10) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-  transaction.status = "HTTP/1.0 200 OK";
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Get the same URL again, without generating a conditional request.
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.handler = ETagGet_UnconditionalRequest_Handler;
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+void MockDiskCache::GetStats(
+    std::vector<std::pair<std::string, std::string> >* stats) {
 }
 
-TEST(HttpCache, ETagGET_Http10_Range) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-  transaction.status = "HTTP/1.0 200 OK";
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Get the same URL again, but use a byte range request.
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.handler = ETagGet_UnconditionalRequest_Handler;
-  transaction.request_headers = "Range: bytes = 5-";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+void MockDiskCache::OnExternalCacheHit(const std::string& key) {
 }
 
-static void ETagGet_ConditionalRequest_NoStore_Handler(
-    const net::HttpRequestInfo* request,
-    std::string* response_status,
-    std::string* response_headers,
-    std::string* response_data) {
-  EXPECT_TRUE(
-      request->extra_headers.HasHeader(net::HttpRequestHeaders::kIfNoneMatch));
-  response_status->assign("HTTP/1.1 304 Not Modified");
-  response_headers->assign("Cache-Control: no-store\n");
-  response_data->clear();
+void MockDiskCache::ReleaseAll() {
+  EntryMap::iterator it = entries_.begin();
+  for (; it != entries_.end(); ++it)
+    it->second->Release();
+  entries_.clear();
 }
 
-TEST(HttpCache, ETagGET_ConditionalRequest_304_NoStore) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Get the same URL again, but this time we expect it to result
-  // in a conditional request.
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.handler = ETagGet_ConditionalRequest_NoStore_Handler;
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  ScopedMockTransaction transaction2(kETagGET_Transaction);
-
-  // Write to the cache again. This should create a new entry.
-  RunTransactionTest(cache.http_cache(), transaction2);
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+void MockDiskCache::CallbackLater(net::OldCompletionCallback* callback,
+                                  int result) {
+  MessageLoop::current()->PostTask(FROM_HERE,
+                                   new CallbackRunner(callback, result));
 }
 
-TEST(HttpCache, SimplePOST_SkipsCache) {
-  MockHttpCache cache;
+//-----------------------------------------------------------------------------
 
-  // Test that we skip the cache for POST requests that do not have an upload
-  // identifier.
-
-  RunTransactionTest(cache.http_cache(), kSimplePOST_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
+int MockBackendFactory::CreateBackend(net::NetLog* net_log,
+                                      disk_cache::Backend** backend,
+                                      net::OldCompletionCallback* callback) {
+  *backend = new MockDiskCache();
+  return net::OK;
 }
 
-// Helper that does 4 requests using HttpCache:
-//
-// (1) loads |kUrl| -- expects |net_response_1| to be returned.
-// (2) loads |kUrl| from cache only -- expects |net_response_1| to be returned.
-// (3) loads |kUrl| using |extra_request_headers| -- expects |net_response_2| to
-//     be returned.
-// (4) loads |kUrl| from cache only -- expects |cached_response_2| to be
-//     returned.
-static void ConditionalizedRequestUpdatesCacheHelper(
-    const Response& net_response_1,
-    const Response& net_response_2,
-    const Response& cached_response_2,
-    const char* extra_request_headers) {
-  MockHttpCache cache;
+//-----------------------------------------------------------------------------
 
-  // The URL we will be requesting.
-  const char* kUrl = "http://foobar.com/main.css";
-
-  // Junk network response.
-  static const Response kUnexpectedResponse = {
-    "HTTP/1.1 500 Unexpected",
-    "Server: unexpected_header",
-    "unexpected body"
-  };
-
-  // We will control the network layer's responses for |kUrl| using
-  // |mock_network_response|.
-  MockTransaction mock_network_response = { 0 };
-  mock_network_response.url = kUrl;
-  AddMockTransaction(&mock_network_response);
-
-  // Request |kUrl| for the first time. It should hit the network and
-  // receive |kNetResponse1|, which it saves into the HTTP cache.
-
-  MockTransaction request = { 0 };
-  request.url = kUrl;
-  request.method = "GET";
-  request.request_headers = "";
-
-  net_response_1.AssignTo(&mock_network_response);  // Network mock.
-  net_response_1.AssignTo(&request);                // Expected result.
-
-  std::string response_headers;
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(net_response_1.status_and_headers(), response_headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Request |kUrl| a second time. Now |kNetResponse1| it is in the HTTP
-  // cache, so we don't hit the network.
-
-  request.load_flags = net::LOAD_ONLY_FROM_CACHE;
-
-  kUnexpectedResponse.AssignTo(&mock_network_response);  // Network mock.
-  net_response_1.AssignTo(&request);                     // Expected result.
-
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(net_response_1.status_and_headers(), response_headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Request |kUrl| yet again, but this time give the request an
-  // "If-Modified-Since" header. This will cause the request to re-hit the
-  // network. However now the network response is going to be
-  // different -- this simulates a change made to the CSS file.
-
-  request.request_headers = extra_request_headers;
-  request.load_flags = net::LOAD_NORMAL;
-
-  net_response_2.AssignTo(&mock_network_response);  // Network mock.
-  net_response_2.AssignTo(&request);                // Expected result.
-
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(net_response_2.status_and_headers(), response_headers);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Finally, request |kUrl| again. This request should be serviced from
-  // the cache. Moreover, the value in the cache should be |kNetResponse2|
-  // and NOT |kNetResponse1|. The previous step should have replaced the
-  // value in the cache with the modified response.
-
-  request.request_headers = "";
-  request.load_flags = net::LOAD_ONLY_FROM_CACHE;
-
-  kUnexpectedResponse.AssignTo(&mock_network_response);  // Network mock.
-  cached_response_2.AssignTo(&request);                  // Expected result.
-
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(cached_response_2.status_and_headers(), response_headers);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&mock_network_response);
+MockHttpCache::MockHttpCache()
+    : http_cache_(new MockNetworkLayer(), NULL, new MockBackendFactory()) {
 }
 
-// Check that when an "if-modified-since" header is attached
-// to the request, the result still updates the cached entry.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache1) {
-  // First network response for |kUrl|.
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Last-Modified: Fri, 03 Jul 2009 02:14:27 GMT\n",
-    "body2"
-  };
-
-  const char* extra_headers =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse2, extra_headers);
+MockHttpCache::MockHttpCache(net::HttpCache::BackendFactory* disk_cache_factory)
+    : http_cache_(new MockNetworkLayer(), NULL, disk_cache_factory) {
 }
 
-// Check that when an "if-none-match" header is attached
-// to the request, the result updates the cached entry.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache2) {
-  // First network response for |kUrl|.
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"ETAG1\"\n"
-    "Expires: Wed, 7 Sep 2033 21:46:42 GMT\n",  // Should never expire.
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"ETAG2\"\n"
-    "Expires: Wed, 7 Sep 2033 21:46:42 GMT\n",  // Should never expire.
-    "body2"
-  };
-
-  const char* extra_headers = "If-None-Match: \"ETAG1\"\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse2, extra_headers);
+MockDiskCache* MockHttpCache::disk_cache() {
+  TestOldCompletionCallback cb;
+  disk_cache::Backend* backend;
+  int rv = http_cache_.GetBackend(&backend, &cb);
+  rv = cb.GetResult(rv);
+  return (rv == net::OK) ? static_cast<MockDiskCache*>(backend) : NULL;
 }
 
-// Check that when an "if-modified-since" header is attached
-// to a request, the 304 (not modified result) result updates the cached
-// headers, and the 304 response is returned rather than the cached response.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache3) {
-  // First network response for |kUrl|.
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Server: server1\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
+bool MockHttpCache::ReadResponseInfo(disk_cache::Entry* disk_entry,
+                                     net::HttpResponseInfo* response_info,
+                                     bool* response_truncated) {
+  int size = disk_entry->GetDataSize(0);
 
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 304 Not Modified",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Server: server2\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    ""
-  };
-
-  static const Response kCachedResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Server: server2\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  const char* extra_headers =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kCachedResponse2, extra_headers);
-}
-
-// Test that when doing an externally conditionalized if-modified-since
-// and there is no corresponding cache entry, a new cache entry is NOT
-// created (304 response).
-TEST(HttpCache, ConditionalizedRequestUpdatesCache4) {
-  MockHttpCache cache;
-
-  const char* kUrl = "http://foobar.com/main.css";
-
-  static const Response kNetResponse = {
-    "HTTP/1.1 304 Not Modified",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    ""
-  };
-
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT";
-
-  // We will control the network layer's responses for |kUrl| using
-  // |mock_network_response|.
-  MockTransaction mock_network_response = { 0 };
-  mock_network_response.url = kUrl;
-  AddMockTransaction(&mock_network_response);
-
-  MockTransaction request = { 0 };
-  request.url = kUrl;
-  request.method = "GET";
-  request.request_headers = kExtraRequestHeaders;
-
-  kNetResponse.AssignTo(&mock_network_response);  // Network mock.
-  kNetResponse.AssignTo(&request);                // Expected result.
-
-  std::string response_headers;
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(kNetResponse.status_and_headers(), response_headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&mock_network_response);
-}
-
-// Test that when doing an externally conditionalized if-modified-since
-// and there is no corresponding cache entry, a new cache entry is NOT
-// created (200 response).
-TEST(HttpCache, ConditionalizedRequestUpdatesCache5) {
-  MockHttpCache cache;
-
-  const char* kUrl = "http://foobar.com/main.css";
-
-  static const Response kNetResponse = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "foobar!!!"
-  };
-
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT";
-
-  // We will control the network layer's responses for |kUrl| using
-  // |mock_network_response|.
-  MockTransaction mock_network_response = { 0 };
-  mock_network_response.url = kUrl;
-  AddMockTransaction(&mock_network_response);
-
-  MockTransaction request = { 0 };
-  request.url = kUrl;
-  request.method = "GET";
-  request.request_headers = kExtraRequestHeaders;
-
-  kNetResponse.AssignTo(&mock_network_response);  // Network mock.
-  kNetResponse.AssignTo(&request);                // Expected result.
-
-  std::string response_headers;
-  RunTransactionTestWithResponse(
-      cache.http_cache(), request, &response_headers);
-
-  EXPECT_EQ(kNetResponse.status_and_headers(), response_headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&mock_network_response);
-}
-
-// Test that when doing an externally conditionalized if-modified-since
-// if the date does not match the cache entry's last-modified date,
-// then we do NOT use the response (304) to update the cache.
-// (the if-modified-since date is 2 days AFTER the cache's modification date).
-TEST(HttpCache, ConditionalizedRequestUpdatesCache6) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Server: server1\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 304 Not Modified",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Server: server2\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    ""
-  };
-
-  // This is two days in the future from the original response's last-modified
-  // date!
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Fri, 08 Feb 2008 22:38:21 GMT\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse1, kExtraRequestHeaders);
-}
-
-// Test that when doing an externally conditionalized if-none-match
-// if the etag does not match the cache entry's etag, then we do not use the
-// response (304) to update the cache.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache7) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"Foo1\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 304 Not Modified",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"Foo2\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    ""
-  };
-
-  // Different etag from original response.
-  const char* kExtraRequestHeaders = "If-None-Match: \"Foo2\"\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse1, kExtraRequestHeaders);
-}
-
-// Test that doing an externally conditionalized request with both if-none-match
-// and if-modified-since updates the cache.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache8) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"Foo1\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"Foo2\"\n"
-    "Last-Modified: Fri, 03 Jul 2009 02:14:27 GMT\n",
-    "body2"
-  };
-
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT\r\n"
-      "If-None-Match: \"Foo1\"\r\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse2, kExtraRequestHeaders);
-}
-
-// Test that doing an externally conditionalized request with both if-none-match
-// and if-modified-since does not update the cache with only one match.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache9) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"Foo1\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"Foo2\"\n"
-    "Last-Modified: Fri, 03 Jul 2009 02:14:27 GMT\n",
-    "body2"
-  };
-
-  // The etag doesn't match what we have stored.
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT\n"
-      "If-None-Match: \"Foo2\"\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse1, kExtraRequestHeaders);
-}
-
-// Test that doing an externally conditionalized request with both if-none-match
-// and if-modified-since does not update the cache with only one match.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache10) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"Foo1\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"Foo2\"\n"
-    "Last-Modified: Fri, 03 Jul 2009 02:14:27 GMT\n",
-    "body2"
-  };
-
-  // The modification date doesn't match what we have stored.
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Fri, 08 Feb 2008 22:38:21 GMT\n"
-      "If-None-Match: \"Foo1\"\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse1, kExtraRequestHeaders);
-}
-
-// Test that doing an externally conditionalized request with two conflicting
-// headers does not update the cache.
-TEST(HttpCache, ConditionalizedRequestUpdatesCache11) {
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Etag: \"Foo1\"\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    "body1"
-  };
-
-  // Second network response for |kUrl|.
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 200 OK",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-    "Etag: \"Foo2\"\n"
-    "Last-Modified: Fri, 03 Jul 2009 02:14:27 GMT\n",
-    "body2"
-  };
-
-  // Two dates, the second matches what we have stored.
-  const char* kExtraRequestHeaders =
-      "If-Modified-Since: Mon, 04 Feb 2008 22:38:21 GMT\n"
-      "If-Modified-Since: Wed, 06 Feb 2008 22:38:21 GMT\n";
-
-  ConditionalizedRequestUpdatesCacheHelper(
-      kNetResponse1, kNetResponse2, kNetResponse1, kExtraRequestHeaders);
-}
-
-TEST(HttpCache, UrlContainingHash) {
-  MockHttpCache cache;
-
-  // Do a typical GET request -- should write an entry into our cache.
-  MockTransaction trans(kTypicalGET_Transaction);
-  RunTransactionTest(cache.http_cache(), trans);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Request the same URL, but this time with a reference section (hash).
-  // Since the cache key strips the hash sections, this should be a cache hit.
-  std::string url_with_hash = std::string(trans.url) + "#multiple#hashes";
-  trans.url = url_with_hash.c_str();
-  trans.load_flags = net::LOAD_ONLY_FROM_CACHE;
-
-  RunTransactionTest(cache.http_cache(), trans);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, SimplePOST_LoadOnlyFromCache_Miss) {
-  MockHttpCache cache;
-
-  // Test that we skip the cache for POST requests.  Eventually, we will want
-  // to cache these, but we'll still have cases where skipping the cache makes
-  // sense, so we want to make sure that it works properly.
-
-  MockTransaction transaction(kSimplePOST_Transaction);
-  transaction.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-
-  MockHttpRequest request(transaction);
-  TestOldCompletionCallback callback;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
-
-  rv = trans->Start(&request, &callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::ERR_CACHE_MISS, rv);
-
-  trans.reset();
-
-  EXPECT_EQ(0, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, SimplePOST_LoadOnlyFromCache_Hit) {
-  MockHttpCache cache;
-
-  // Test that we hit the cache for POST requests.
-
-  MockTransaction transaction(kSimplePOST_Transaction);
-
-  const int64 kUploadId = 1;  // Just a dummy value.
-
-  MockHttpRequest request(transaction);
-  request.upload_data = new net::UploadData();
-  request.upload_data->set_identifier(kUploadId);
-  request.upload_data->AppendBytes("hello", 5);
-
-  // Populate the cache.
-  RunTransactionTestWithRequest(cache.http_cache(), transaction, request, NULL);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Load from cache.
-  request.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-  RunTransactionTestWithRequest(cache.http_cache(), transaction, request, NULL);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-TEST(HttpCache, RangeGET_SkipsCache) {
-  MockHttpCache cache;
-
-  // Test that we skip the cache for range GET requests.  Eventually, we will
-  // want to cache these, but we'll still have cases where skipping the cache
-  // makes sense, so we want to make sure that it works properly.
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.request_headers = "If-None-Match: foo";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  transaction.request_headers =
-      "If-Modified-Since: Wed, 28 Nov 2007 00:45:20 GMT";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-}
-
-// Test that we skip the cache for range requests that include a validation
-// header.
-TEST(HttpCache, RangeGET_SkipsCache2) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kRangeGET_Transaction);
-  transaction.request_headers = "If-None-Match: foo\r\n"
-                                EXTRA_HEADER
-                                "\r\nRange: bytes = 40-49";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  transaction.request_headers =
-      "If-Modified-Since: Wed, 28 Nov 2007 00:45:20 GMT\r\n"
-      EXTRA_HEADER
-      "\r\nRange: bytes = 40-49";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  transaction.request_headers = "If-Range: bla\r\n"
-                                EXTRA_HEADER
-                                "\r\nRange: bytes = 40-49\n";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-}
-
-// Tests that receiving 206 for a regular request is handled correctly.
-TEST(HttpCache, GET_Crazy206) {
-  MockHttpCache cache;
-
-  // Write to the cache.
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  AddMockTransaction(&transaction);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.handler = NULL;
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // This should read again from the net.
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we don't cache partial responses that can't be validated.
-TEST(HttpCache, RangeGET_NoStrongValidators) {
-  MockHttpCache cache;
-  std::string headers;
-
-  // Attempt to write to the cache (40-49).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  AddMockTransaction(&transaction);
-  transaction.response_headers = "Content-Length: 10\n"
-                                 "ETag: w/\"foo\"\n";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Now verify that there's no cached data.
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we can cache range requests and fetch random blocks from the
-// cache and the network.
-TEST(HttpCache, RangeGET_OK) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write to the cache (30-39).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = 30-39\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 30-39 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 30, 39);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write and read from the cache (20-59).
-  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 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 20, 59);
-  EXPECT_EQ(4, cache.network_layer()->transaction_count());
-  EXPECT_EQ(3, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can cache range requests and fetch random blocks from the
-// cache and the network, with synchronous responses.
-TEST(HttpCache, RangeGET_SyncOK) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.test_mode = TEST_MODE_SYNC_ALL;
-  AddMockTransaction(&transaction);
-
-  // Write to the cache (40-49).
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write to the cache (30-39).
-  transaction.request_headers = "Range: bytes = 30-39\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 30-39 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 30, 39);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write and read from the cache (20-59).
-  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 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 20, 59);
-  EXPECT_EQ(4, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we don't revalidate an entry unless we are required to do so.
-TEST(HttpCache, RangeGET_Revalidate1) {
-  MockHttpCache cache;
-  std::string headers;
-
-  // Write to the cache (40-49).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.response_headers =
-      "Last-Modified: Sat, 18 Apr 2009 01:10:43 GMT\n"
-      "Expires: Wed, 7 Sep 2033 21:46:42 GMT\n"  // Should never expire.
-      "ETag: \"foo\"\n"
-      "Accept-Ranges: bytes\n"
-      "Content-Length: 10\n";
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-  Verify206Response(headers, 40, 49);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read again forcing the revalidation.
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Checks that we revalidate an entry when the headers say so.
-TEST(HttpCache, RangeGET_Revalidate2) {
-  MockHttpCache cache;
-  std::string headers;
-
-  // Write to the cache (40-49).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.response_headers =
-      "Last-Modified: Sat, 18 Apr 2009 01:10:43 GMT\n"
-      "Expires: Sat, 18 Apr 2009 01:10:43 GMT\n"  // Expired.
-      "ETag: \"foo\"\n"
-      "Accept-Ranges: bytes\n"
-      "Content-Length: 10\n";
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-  Verify206Response(headers, 40, 49);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we deal with 304s for range requests.
-TEST(HttpCache, RangeGET_304) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (40-49).
-  RangeTransactionServer handler;
-  handler.set_not_modified(true);
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we deal with 206s when revalidating range requests.
-TEST(HttpCache, RangeGET_ModifiedResult) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Attempt to read from the cache (40-49).
-  RangeTransactionServer handler;
-  handler.set_modified(true);
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // And the entry should be gone.
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can cache range requests when the start or end is unknown.
-// We start with one suffix request, followed by a request from a given point.
-TEST(HttpCache, UnknownRangeGET_1) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (70-79).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = -10\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 70, 79);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write and read from the cache (60-79).
-  transaction.request_headers = "Range: bytes = 60-\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 60-69 rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 60, 79);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can cache range requests when the start or end is unknown.
-// We start with one request from a given point, followed by a suffix request.
-// We'll also verify that synchronous cache responses work as intended.
-TEST(HttpCache, UnknownRangeGET_2) {
-  MockHttpCache cache;
-  std::string headers;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.test_mode = TEST_MODE_SYNC_CACHE_START |
-                          TEST_MODE_SYNC_CACHE_READ |
-                          TEST_MODE_SYNC_CACHE_WRITE;
-  AddMockTransaction(&transaction);
-
-  // Write to the cache (70-79).
-  transaction.request_headers = "Range: bytes = 70-\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 70, 79);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure we are done with the previous transaction.
-  MessageLoop::current()->RunAllPending();
-
-  // Write and read from the cache (60-79).
-  transaction.request_headers = "Range: bytes = -20\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 60-69 rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 60, 79);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that receiving Not Modified when asking for an open range doesn't mess
-// up things.
-TEST(HttpCache, UnknownRangeGET_304) {
-  MockHttpCache cache;
-  std::string headers;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  AddMockTransaction(&transaction);
-
-  RangeTransactionServer handler;
-  handler.set_not_modified(true);
-
-  // Ask for the end of the file, without knowing the length.
-  transaction.request_headers = "Range: bytes = 70-\r\n" EXTRA_HEADER;
-  transaction.data = "";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  // We just bypass the cache.
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 304 Not Modified\n"));
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we can handle non-range requests when we have cached a range.
-TEST(HttpCache, GET_Previous206) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Write and read from the cache (0-79), when not asked for a range.
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.data = "rg: 00-09 rg: 10-19 rg: 20-29 rg: 30-39 rg: 40-49 "
-                     "rg: 50-59 rg: 60-69 rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 200 OK\n"));
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can handle non-range requests when we have cached the first
-// part of the object and the server replies with 304 (Not Modified).
-TEST(HttpCache, GET_Previous206_NotModified) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  AddMockTransaction(&transaction);
-  std::string headers;
-
-  // Write to the cache (0-9).
-  transaction.request_headers = "Range: bytes = 0-9\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 00-09 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-  Verify206Response(headers, 0, 9);
-
-  // Write to the cache (70-79).
-  transaction.request_headers = "Range: bytes = 70-79\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-  Verify206Response(headers, 70, 79);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Read from the cache (0-9), write and read from cache (10 - 79).
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  transaction.request_headers = "Foo: bar\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 00-09 rg: 10-19 rg: 20-29 rg: 30-39 rg: 40-49 "
-                      "rg: 50-59 rg: 60-69 rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 200 OK\n"));
-  EXPECT_EQ(4, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we can handle a regular request to a sparse entry, that results in
-// new content provided by the server (206).
-TEST(HttpCache, GET_Previous206_NewContent) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (0-9).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = 0-9\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 00-09 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 0, 9);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Now we'll issue a request without any range that should result first in a
-  // 206 (when revalidating), and then in a weird standard answer: the test
-  // server will not modify the response so we'll get the default range... a
-  // real server will answer with 200.
-  MockTransaction transaction2(kRangeGET_TransactionOK);
-  transaction2.request_headers = EXTRA_HEADER;
-  transaction2.load_flags |= net::LOAD_VALIDATE_CACHE;
-  transaction2.data = "Not a range";
-  RangeTransactionServer handler;
-  handler.set_modified(true);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction2, &headers);
-
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 200 OK\n"));
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that the previous request deleted the entry.
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we can handle cached 206 responses that are not sparse.
-TEST(HttpCache, GET_Previous206_NotSparse) {
-  MockHttpCache cache;
-
-  // Create a disk cache entry that stores 206 headers while not being sparse.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.CreateBackendEntry(kSimpleGET_Transaction.url, &entry,
-                                       NULL));
-
-  std::string raw_headers(kRangeGET_TransactionOK.status);
-  raw_headers.append("\n");
-  raw_headers.append(kRangeGET_TransactionOK.response_headers);
-  raw_headers = net::HttpUtil::AssembleRawHeaders(raw_headers.data(),
-                                                  raw_headers.size());
-
-  net::HttpResponseInfo response;
-  response.headers = new net::HttpResponseHeaders(raw_headers);
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, false));
-
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(500));
-  int len = static_cast<int>(base::strlcpy(buf->data(),
-                                           kRangeGET_TransactionOK.data, 500));
   TestOldCompletionCallback cb;
-  int rv = entry->WriteData(1, 0, buf, len, &cb, true);
-  EXPECT_EQ(len, cb.GetResult(rv));
-  entry->Close();
+  scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(size));
+  int rv = disk_entry->ReadData(0, 0, buffer, size, &cb);
+  rv = cb.GetResult(rv);
+  EXPECT_EQ(size, rv);
 
-  // Now see that we don't use the stored entry.
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), kSimpleGET_Transaction,
-                                 &headers);
-
-  // We are expecting a 200.
-  std::string expected_headers(kSimpleGET_Transaction.status);
-  expected_headers.append("\n");
-  expected_headers.append(kSimpleGET_Transaction.response_headers);
-  EXPECT_EQ(expected_headers, headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+  return net::HttpCache::ParseResponseInfo(buffer->data(), size,
+                                           response_info,
+                                           response_truncated);
 }
 
-// Tests that we can handle cached 206 responses that are not sparse. This time
-// we issue a range request and expect to receive a range.
-TEST(HttpCache, RangeGET_Previous206_NotSparse_2) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
+bool MockHttpCache::WriteResponseInfo(
+    disk_cache::Entry* disk_entry, const net::HttpResponseInfo* response_info,
+    bool skip_transient_headers, bool response_truncated) {
+  Pickle pickle;
+  response_info->Persist(
+      &pickle, skip_transient_headers, response_truncated);
 
-  // Create a disk cache entry that stores 206 headers while not being sparse.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.CreateBackendEntry(kRangeGET_TransactionOK.url, &entry,
-                                       NULL));
-
-  std::string raw_headers(kRangeGET_TransactionOK.status);
-  raw_headers.append("\n");
-  raw_headers.append(kRangeGET_TransactionOK.response_headers);
-  raw_headers = net::HttpUtil::AssembleRawHeaders(raw_headers.data(),
-                                                  raw_headers.size());
-
-  net::HttpResponseInfo response;
-  response.headers = new net::HttpResponseHeaders(raw_headers);
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, false));
-
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(500));
-  int len = static_cast<int>(base::strlcpy(buf->data(),
-                                           kRangeGET_TransactionOK.data, 500));
   TestOldCompletionCallback cb;
-  int rv = entry->WriteData(1, 0, buf, len, &cb, true);
-  EXPECT_EQ(len, cb.GetResult(rv));
-  entry->Close();
+  scoped_refptr<net::WrappedIOBuffer> data(new net::WrappedIOBuffer(
+      reinterpret_cast<const char*>(pickle.data())));
+  int len = static_cast<int>(pickle.size());
 
-  // Now see that we don't use the stored entry.
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  // We are expecting a 206.
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
+  int rv =  disk_entry->WriteData(0, 0, data, len, &cb, true);
+  rv = cb.GetResult(rv);
+  return (rv == len);
 }
 
-// Tests that we can handle cached 206 responses that can't be validated.
-TEST(HttpCache, GET_Previous206_NotValidation) {
-  MockHttpCache cache;
-
-  // Create a disk cache entry that stores 206 headers.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.CreateBackendEntry(kSimpleGET_Transaction.url, &entry,
-                                       NULL));
-
-  // Make sure that the headers cannot be validated with the server.
-  std::string raw_headers(kRangeGET_TransactionOK.status);
-  raw_headers.append("\n");
-  raw_headers.append("Content-Length: 80\n");
-  raw_headers = net::HttpUtil::AssembleRawHeaders(raw_headers.data(),
-                                                  raw_headers.size());
-
-  net::HttpResponseInfo response;
-  response.headers = new net::HttpResponseHeaders(raw_headers);
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, false));
-
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(500));
-  int len = static_cast<int>(base::strlcpy(buf->data(),
-                                           kRangeGET_TransactionOK.data, 500));
+bool MockHttpCache::OpenBackendEntry(const std::string& key,
+                                     disk_cache::Entry** entry) {
   TestOldCompletionCallback cb;
-  int rv = entry->WriteData(1, 0, buf, len, &cb, true);
-  EXPECT_EQ(len, cb.GetResult(rv));
-  entry->Close();
-
-  // Now see that we don't use the stored entry.
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), kSimpleGET_Transaction,
-                                 &headers);
-
-  // We are expecting a 200.
-  std::string expected_headers(kSimpleGET_Transaction.status);
-  expected_headers.append("\n");
-  expected_headers.append(kSimpleGET_Transaction.response_headers);
-  EXPECT_EQ(expected_headers, headers);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
+  int rv = disk_cache()->OpenEntry(key, entry, &cb);
+  return (cb.GetResult(rv) == net::OK);
 }
 
-// Tests that we can handle range requests with cached 200 responses.
-TEST(HttpCache, RangeGET_Previous200) {
-  MockHttpCache cache;
-
-  // Store the whole thing with status 200.
-  MockTransaction transaction(kTypicalGET_Transaction);
-  transaction.url = kRangeGET_TransactionOK.url;
-  transaction.data = "rg: 00-09 rg: 10-19 rg: 20-29 rg: 30-39 rg: 40-49 "
-                     "rg: 50-59 rg: 60-69 rg: 70-79 ";
-  AddMockTransaction(&transaction);
-  RunTransactionTest(cache.http_cache(), transaction);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // Now see that we use the stored entry.
-  std::string headers;
-  MockTransaction transaction2(kRangeGET_TransactionOK);
-  RangeTransactionServer handler;
-  handler.set_not_modified(true);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction2, &headers);
-
-  // We are expecting a 206.
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // The last transaction has finished so make sure the entry is deactivated.
-  MessageLoop::current()->RunAllPending();
-
-  // Make a request for an invalid range.
-  MockTransaction transaction3(kRangeGET_TransactionOK);
-  transaction3.request_headers = "Range: bytes = 80-90\r\n" EXTRA_HEADER;
-  transaction3.data = "";
-  transaction3.load_flags = net::LOAD_PREFERRING_CACHE;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction3, &headers);
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 416 "));
-  EXPECT_NE(std::string::npos, headers.find("Content-Range: bytes 0-0/80"));
-  EXPECT_NE(std::string::npos, headers.find("Content-Length: 0"));
-
-  // Make sure the entry is deactivated.
-  MessageLoop::current()->RunAllPending();
-
-  // Even though the request was invalid, we should have the entry.
-  RunTransactionTest(cache.http_cache(), transaction2);
-  EXPECT_EQ(3, cache.disk_cache()->open_count());
-
-  // Make sure the entry is deactivated.
-  MessageLoop::current()->RunAllPending();
-
-  // Now we should receive a range from the server and drop the stored entry.
-  handler.set_not_modified(false);
-  transaction2.request_headers = kRangeGET_TransactionOK.request_headers;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction2, &headers);
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(5, cache.network_layer()->transaction_count());
-  EXPECT_EQ(4, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RunTransactionTest(cache.http_cache(), transaction2);
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can handle a 200 response when dealing with sparse entries.
-TEST(HttpCache, RangeRequestResultsIn200) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (70-79).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = -10\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 70, 79);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Now we'll issue a request that results in a plain 200 response, but to
-  // the to the same URL that we used to store sparse data, and making sure
-  // that we ask for a range.
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-  MockTransaction transaction2(kSimpleGET_Transaction);
-  transaction2.url = kRangeGET_TransactionOK.url;
-  transaction2.request_headers = kRangeGET_TransactionOK.request_headers;
-  AddMockTransaction(&transaction2);
-
-  RunTransactionTestWithResponse(cache.http_cache(), transaction2, &headers);
-
-  std::string expected_headers(kSimpleGET_Transaction.status);
-  expected_headers.append("\n");
-  expected_headers.append(kSimpleGET_Transaction.response_headers);
-  EXPECT_EQ(expected_headers, headers);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction2);
-}
-
-// Tests that a range request that falls outside of the size that we know about
-// only deletes the entry if the resource has indeed changed.
-TEST(HttpCache, RangeGET_MoreThanCurrentSize) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-  std::string headers;
-
-  // Write to the cache (40-49).
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // A weird request should not delete this entry. Ask for bytes 120-.
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = 120-\r\n" EXTRA_HEADER;
-  transaction.data = "";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  EXPECT_EQ(0U, headers.find("HTTP/1.1 416 "));
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we don't delete a sparse entry when we cancel a request.
-TEST(HttpCache, RangeGET_Cancel) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  MockHttpRequest request(kRangeGET_TransactionOK);
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that the entry has some data stored.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(10));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-  EXPECT_EQ(buf->size(), rv);
-
-  // Destroy the transaction.
-  delete c;
-
-  // Verify that the entry has not been deleted.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-  entry->Close();
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we don't delete a sparse entry when we start a new request after
-// cancelling the previous one.
-TEST(HttpCache, RangeGET_Cancel2) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  MockHttpRequest request(kRangeGET_TransactionOK);
-  request.load_flags |= net::LOAD_VALIDATE_CACHE;
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that we revalidate the entry and read from the cache (a single
-  // read will return while waiting for the network).
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(5));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(5, c->callback.GetResult(rv));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  // Destroy the transaction before completing the read.
-  delete c;
-
-  // We have the read and the delete (OnProcessPendingQueue) waiting on the
-  // message loop. This means that a new transaction will just reuse the same
-  // active entry (no open or create).
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// A slight variation of the previous test, this time we cancel two requests in
-// a row, making sure that the second is waiting for the entry to be ready.
-TEST(HttpCache, RangeGET_Cancel3) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  MockHttpRequest request(kRangeGET_TransactionOK);
-  request.load_flags |= net::LOAD_VALIDATE_CACHE;
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-  rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that we revalidate the entry and read from the cache (a single
-  // read will return while waiting for the network).
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(5));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(5, c->callback.GetResult(rv));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  // Destroy the transaction before completing the read.
-  delete c;
-
-  // We have the read and the delete (OnProcessPendingQueue) waiting on the
-  // message loop. This means that a new transaction will just reuse the same
-  // active entry (no open or create).
-
-  c = new Context();
-  rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-
-  MockDiskEntry::IgnoreCallbacks(true);
-  MessageLoop::current()->RunAllPending();
-  MockDiskEntry::IgnoreCallbacks(false);
-
-  // The new transaction is waiting for the query range callback.
-  delete c;
-
-  // And we should not crash when the callback is delivered.
-  MessageLoop::current()->RunAllPending();
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that an invalid range response results in no cached entry.
-TEST(HttpCache, RangeGET_InvalidResponse1) {
-  MockHttpCache cache;
-  std::string headers;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.handler = NULL;
-  transaction.response_headers = "Content-Range: bytes 40-49/45\n"
-                                 "Content-Length: 10\n";
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  std::string expected(transaction.status);
-  expected.append("\n");
-  expected.append(transaction.response_headers);
-  EXPECT_EQ(expected, headers);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that we don't have a cached entry.
-  disk_cache::Entry* entry;
-  EXPECT_FALSE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we reject a range that doesn't match the content-length.
-TEST(HttpCache, RangeGET_InvalidResponse2) {
-  MockHttpCache cache;
-  std::string headers;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.handler = NULL;
-  transaction.response_headers = "Content-Range: bytes 40-49/80\n"
-                                 "Content-Length: 20\n";
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  std::string expected(transaction.status);
-  expected.append("\n");
-  expected.append(transaction.response_headers);
-  EXPECT_EQ(expected, headers);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that we don't have a cached entry.
-  disk_cache::Entry* entry;
-  EXPECT_FALSE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that if a server tells us conflicting information about a resource we
-// ignore the response.
-TEST(HttpCache, RangeGET_InvalidResponse3) {
-  MockHttpCache cache;
-  std::string headers;
-
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.handler = NULL;
-  transaction.request_headers = "Range: bytes = 50-59\r\n" EXTRA_HEADER;
-  std::string response_headers(transaction.response_headers);
-  response_headers.append("Content-Range: bytes 50-59/160\n");
-  transaction.response_headers = response_headers.c_str();
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 50, 59);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // This transaction will report a resource size of 80 bytes, and we think it's
-  // 160 so we should ignore the response.
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that we cached the first response but not the second one.
-  disk_cache::Entry* en;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &en));
-
-  int64 cached_start = 0;
+bool MockHttpCache::CreateBackendEntry(const std::string& key,
+                                       disk_cache::Entry** entry,
+                                       net::NetLog* net_log) {
   TestOldCompletionCallback cb;
-  int rv = en->GetAvailableRange(40, 20, &cached_start, &cb);
-  EXPECT_EQ(10, cb.GetResult(rv));
-  EXPECT_EQ(50, cached_start);
-  en->Close();
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
+  int rv = disk_cache()->CreateEntry(key, entry, &cb);
+  return (cb.GetResult(rv) == net::OK);
 }
 
-// Tests that we handle large range values properly.
-TEST(HttpCache, RangeGET_LargeValues) {
-  // We need a real sparse cache for this test.
-  MockHttpCache cache(net::HttpCache::DefaultBackend::InMemory(1024 * 1024));
-  std::string headers;
+// Static.
+int MockHttpCache::GetTestMode(int test_mode) {
+  if (!g_test_mode)
+    return test_mode;
 
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.handler = NULL;
-  transaction.request_headers = "Range: bytes = 4294967288-4294967297\r\n"
-                                EXTRA_HEADER;
-  transaction.response_headers =
-      "ETag: \"foo\"\n"
-      "Content-Range: bytes 4294967288-4294967297/4294967299\n"
-      "Content-Length: 10\n";
-  AddMockTransaction(&transaction);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  std::string expected(transaction.status);
-  expected.append("\n");
-  expected.append(transaction.response_headers);
-  EXPECT_EQ(expected, headers);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
-  // Verify that we have a cached entry.
-  disk_cache::Entry* en;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &en));
-  en->Close();
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
+  return g_test_mode;
 }
 
-// Tests that we don't crash with a range request if the disk cache was not
-// initialized properly.
-TEST(HttpCache, RangeGET_NoDiskCache) {
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  factory->set_fail(true);
-  factory->FinishCreation();  // We'll complete synchronously.
-  MockHttpCache cache(factory);
-
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
+// Static.
+void MockHttpCache::SetTestMode(int test_mode) {
+  g_test_mode = test_mode;
 }
 
-// Tests that we handle byte range requests that skip the cache.
-TEST(HttpCache, RangeHEAD) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
+//-----------------------------------------------------------------------------
 
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = -10\r\n" EXTRA_HEADER;
-  transaction.method = "HEAD";
-  transaction.data = "rg: 70-79 ";
-
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  Verify206Response(headers, 70, 79);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(0, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
+int MockDiskCacheNoCB::CreateEntry(const std::string& key,
+                                   disk_cache::Entry** entry,
+                                   net::OldCompletionCallback* callback) {
+  return net::ERR_IO_PENDING;
 }
 
-// Tests that we don't crash when after reading from the cache we issue a
-// request for the next range and the server gives us a 200 synchronously.
-TEST(HttpCache, RangeGET_FastFlakyServer) {
-  MockHttpCache cache;
+//-----------------------------------------------------------------------------
 
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = 40-\r\n" EXTRA_HEADER;
-  transaction.test_mode = TEST_MODE_SYNC_NET_START;
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  AddMockTransaction(&transaction);
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-
-  // And now read from the cache and the network.
-  RangeTransactionServer handler;
-  handler.set_bad_200(true);
-  transaction.data = "Not a range";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
+int MockBackendNoCbFactory::CreateBackend(net::NetLog* net_log,
+                                          disk_cache::Backend** backend,
+                                          net::OldCompletionCallback* callback) {
+  *backend = new MockDiskCacheNoCB();
+  return net::OK;
 }
 
-// Tests that when the server gives us less data than expected, we don't keep
-// asking for more data.
-TEST(HttpCache, RangeGET_FastFlakyServer2) {
-  MockHttpCache cache;
+//-----------------------------------------------------------------------------
 
-  // First, check with an empty cache (WRITE mode).
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = "Range: bytes = 40-49\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 40-";  // Less than expected.
-  transaction.handler = NULL;
-  std::string headers(transaction.response_headers);
-  headers.append("Content-Range: bytes 40-49/80\n");
-  transaction.response_headers = headers.c_str();
-
-  AddMockTransaction(&transaction);
-
-  // Write to the cache.
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Now verify that even in READ_WRITE mode, we forward the bad response to
-  // the caller.
-  transaction.request_headers = "Range: bytes = 60-69\r\n" EXTRA_HEADER;
-  transaction.data = "rg: 60-";  // Less than expected.
-  headers = kRangeGET_TransactionOK.response_headers;
-  headers.append("Content-Range: bytes 60-69/80\n");
-  transaction.response_headers = headers.c_str();
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
+MockBlockingBackendFactory::MockBlockingBackendFactory()
+    : backend_(NULL), callback_(NULL), block_(true), fail_(false) {
 }
 
-#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)
-// This test hits a NOTREACHED so it is a release mode only test.
-TEST(HttpCache, RangeGET_OK_LoadOnlyFromCache) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // Write to the cache (40-49).
-  RunTransactionTest(cache.http_cache(), kRangeGET_TransactionOK);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Force this transaction to read from the cache.
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-
-  MockHttpRequest request(transaction);
-  TestOldCompletionCallback callback;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
-
-  rv = trans->Start(&request, &callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::ERR_CACHE_MISS, rv);
-
-  trans.reset();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-#endif
-
-// Tests the handling of the "truncation" flag.
-TEST(HttpCache, WriteResponseInfo_Truncated) {
-  MockHttpCache cache;
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.CreateBackendEntry("http://www.google.com", &entry,
-                                       NULL));
-
-  std::string headers("HTTP/1.1 200 OK");
-  headers = net::HttpUtil::AssembleRawHeaders(headers.data(), headers.size());
-  net::HttpResponseInfo response;
-  response.headers = new net::HttpResponseHeaders(headers);
-
-  // Set the last argument for this to be an incomplete request.
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, true));
-  bool truncated = false;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_TRUE(truncated);
-
-  // And now test the opposite case.
-  EXPECT_TRUE(MockHttpCache::WriteResponseInfo(entry, &response, true, false));
-  truncated = true;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_FALSE(truncated);
-  entry->Close();
-}
-
-// Tests basic pickling/unpickling of HttpResponseInfo.
-TEST(HttpCache, PersistHttpResponseInfo) {
-  // Set some fields (add more if needed.)
-  net::HttpResponseInfo response1;
-  response1.was_cached = false;
-  response1.socket_address = net::HostPortPair("1.2.3.4", 80);
-  response1.headers = new net::HttpResponseHeaders("HTTP/1.1 200 OK");
-
-  // Pickle.
-  Pickle pickle;
-  response1.Persist(&pickle, false, false);
-
-  // Unpickle.
-  net::HttpResponseInfo response2;
-  bool response_truncated;
-  EXPECT_TRUE(response2.InitFromPickle(pickle, &response_truncated));
-  EXPECT_FALSE(response_truncated);
-
-  // Verify fields.
-  EXPECT_TRUE(response2.was_cached);  // InitFromPickle sets this flag.
-  EXPECT_EQ("1.2.3.4", response2.socket_address.host());
-  EXPECT_EQ(80, response2.socket_address.port());
-  EXPECT_EQ("HTTP/1.1 200 OK", response2.headers->GetStatusLine());
-}
-
-// Tests that we delete an entry when the request is cancelled before starting
-// to read from the network.
-TEST(HttpCache, DoomOnDestruction) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    c->result = c->callback.WaitForResult();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Destroy the transaction. We only have the headers so we should delete this
-  // entry.
-  delete c;
-
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-}
-
-// Tests that we delete an entry when the request is cancelled if the response
-// does not have content-length and strong validators.
-TEST(HttpCache, DoomOnDestruction2) {
-  MockHttpCache cache;
-
-  MockHttpRequest request(kSimpleGET_Transaction);
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that the entry has some data stored.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(10));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-  EXPECT_EQ(buf->size(), rv);
-
-  // Destroy the transaction.
-  delete c;
-
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-}
-
-// Tests that we delete an entry when the request is cancelled if the response
-// has an "Accept-Ranges: none" header.
-TEST(HttpCache, DoomOnDestruction3) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.response_headers =
-      "Last-Modified: Wed, 28 Nov 2007 00:40:09 GMT\n"
-      "Content-Length: 22\n"
-      "Accept-Ranges: none\n"
-      "Etag: foopy\n";
-  AddMockTransaction(&transaction);
-  MockHttpRequest request(transaction);
-
-  Context* c = new Context();
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that the entry has some data stored.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(10));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-  EXPECT_EQ(buf->size(), rv);
-
-  // Destroy the transaction.
-  delete c;
-
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we mark an entry as incomplete when the request is cancelled.
-TEST(HttpCache, SetTruncatedFlag) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.response_headers =
-      "Last-Modified: Wed, 28 Nov 2007 00:40:09 GMT\n"
-      "Content-Length: 22\n"
-      "Etag: foopy\n";
-  AddMockTransaction(&transaction);
-  MockHttpRequest request(transaction);
-
-  scoped_ptr<Context> c(new Context());
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Make sure that the entry has some data stored.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(10));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  if (rv == net::ERR_IO_PENDING)
-    rv = c->callback.WaitForResult();
-  EXPECT_EQ(buf->size(), rv);
-
-  // We want to cancel the request when the transaction is busy.
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-  EXPECT_FALSE(c->callback.have_result());
-
-  g_test_mode = TEST_MODE_SYNC_ALL;
-
-  // Destroy the transaction.
-  c->trans.reset();
-  g_test_mode = 0;
-
-  // Make sure that we don't invoke the callback. We may have an issue if the
-  // UrlRequestJob is killed directly (without cancelling the UrlRequest) so we
-  // could end up with the transaction being deleted twice if we send any
-  // notification from the transaction destructor (see http://crbug.com/31723).
-  EXPECT_FALSE(c->callback.have_result());
-
-  // Verify that the entry is marked as incomplete.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kSimpleGET_Transaction.url, &entry));
-  net::HttpResponseInfo response;
-  bool truncated = false;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_TRUE(truncated);
-  entry->Close();
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we don't mark an entry as truncated when we read everything.
-TEST(HttpCache, DontSetTruncatedFlag) {
-  MockHttpCache cache;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  transaction.response_headers =
-      "Last-Modified: Wed, 28 Nov 2007 00:40:09 GMT\n"
-      "Content-Length: 22\n"
-      "Etag: foopy\n";
-  AddMockTransaction(&transaction);
-  MockHttpRequest request(transaction);
-
-  scoped_ptr<Context> c(new Context());
-  int rv = cache.http_cache()->CreateTransaction(&c->trans);
-  EXPECT_EQ(net::OK, rv);
-
-  rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::OK, c->callback.GetResult(rv));
-
-  // Read everything.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(22));
-  rv = c->trans->Read(buf, buf->size(), &c->callback);
-  EXPECT_EQ(buf->size(), c->callback.GetResult(rv));
-
-  // Destroy the transaction.
-  c->trans.reset();
-
-  // Verify that the entry is not marked as truncated.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kSimpleGET_Transaction.url, &entry));
-  net::HttpResponseInfo response;
-  bool truncated = true;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_FALSE(truncated);
-  entry->Close();
-
-  RemoveMockTransaction(&transaction);
-}
-
-// Tests that we can continue with a request that was interrupted.
-TEST(HttpCache, GET_IncompleteResource) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
-                          "ETag: \"foo\"\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 80\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a regular request.
-  std::string headers;
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.data = "rg: 00-09 rg: 10-19 rg: 20-29 rg: 30-39 rg: 40-49 "
-                     "rg: 50-59 rg: 60-69 rg: 70-79 ";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  // We update the headers with the ones received while revalidating.
-  std::string expected_headers(
-      "HTTP/1.1 200 OK\n"
-      "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
-      "Accept-Ranges: bytes\n"
-      "ETag: \"foo\"\n"
-      "Content-Length: 80\n");
-
-  EXPECT_EQ(expected_headers, headers);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that the disk entry was updated.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-  EXPECT_EQ(80, entry->GetDataSize(1));
-  bool truncated = true;
-  net::HttpResponseInfo response;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_FALSE(truncated);
-  entry->Close();
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we delete truncated entries if the server changes its mind midway.
-TEST(HttpCache, GET_IncompleteResource2) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // Content-length will be intentionally bad.
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
-                          "ETag: \"foo\"\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 50\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a regular request. We expect the code to fail the validation and
-  // retry the request without using byte ranges.
-  std::string headers;
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.data = "Not a range";
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  // The server will return 200 instead of a byte range.
-  std::string expected_headers(
-      "HTTP/1.1 200 OK\n"
-      "Date: Wed, 28 Nov 2007 09:40:09 GMT\n");
-
-  EXPECT_EQ(expected_headers, headers);
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that the disk entry was deleted.
-  disk_cache::Entry* entry;
-  ASSERT_FALSE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we always validate a truncated request.
-TEST(HttpCache, GET_IncompleteResource3) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // This should not require validation for 10 hours.
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: Sat, 18 Apr 2009 01:10:43 GMT\n"
-                          "ETag: \"foo\"\n"
-                          "Cache-Control: max-age= 36000\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 80\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a regular request.
-  std::string headers;
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.data = "rg: 00-09 rg: 10-19 rg: 20-29 rg: 30-39 rg: 40-49 "
-                     "rg: 50-59 rg: 60-69 rg: 70-79 ";
-
-  scoped_ptr<Context> c(new Context);
-  EXPECT_EQ(net::OK, cache.http_cache()->CreateTransaction(&c->trans));
-
-  MockHttpRequest request(transaction);
-  int rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::OK, c->callback.GetResult(rv));
-
-  // We should have checked with the server before finishing Start().
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we cache a 200 response to the validation request.
-TEST(HttpCache, GET_IncompleteResource4) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: Sat, 18 Apr 2009 01:10:43 GMT\n"
-                          "ETag: \"foo\"\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 80\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a regular request.
-  std::string headers;
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-  transaction.data = "Not a range";
-  RangeTransactionServer handler;
-  handler.set_bad_200(true);
-  RunTransactionTestWithResponse(cache.http_cache(), transaction, &headers);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that the disk entry was updated.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-  EXPECT_EQ(11, entry->GetDataSize(1));
-  bool truncated = true;
-  net::HttpResponseInfo response;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_FALSE(truncated);
-  entry->Close();
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that when we cancel a request that was interrupted, we mark it again
-// as truncated.
-TEST(HttpCache, GET_CancelIncompleteResource) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: Sat, 18 Apr 2009 01:10:43 GMT\n"
-                          "ETag: \"foo\"\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 80\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a regular request.
-  MockTransaction transaction(kRangeGET_TransactionOK);
-  transaction.request_headers = EXTRA_HEADER;
-
-  MockHttpRequest request(transaction);
-  Context* c = new Context();
-  EXPECT_EQ(net::OK, cache.http_cache()->CreateTransaction(&c->trans));
-
-  int rv = c->trans->Start(&request, &c->callback, net::BoundNetLog());
-  EXPECT_EQ(net::OK, c->callback.GetResult(rv));
-
-  // Read 20 bytes from the cache, and 10 from the net.
-  scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(100));
-  rv = c->trans->Read(buf, 20, &c->callback);
-  EXPECT_EQ(20, c->callback.GetResult(rv));
-  rv = c->trans->Read(buf, 10, &c->callback);
-  EXPECT_EQ(10, c->callback.GetResult(rv));
-
-  // At this point, we are already reading so canceling the request should leave
-  // a truncated one.
-  delete c;
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // Verify that the disk entry was updated: now we have 30 bytes.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kRangeGET_TransactionOK.url, &entry));
-  EXPECT_EQ(30, entry->GetDataSize(1));
-  bool truncated = false;
-  net::HttpResponseInfo response;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_TRUE(truncated);
-  entry->Close();
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-// Tests that we can handle range requests when we have a truncated entry.
-TEST(HttpCache, RangeGET_IncompleteResource) {
-  MockHttpCache cache;
-  AddMockTransaction(&kRangeGET_TransactionOK);
-
-  // Content-length will be intentionally bogus.
-  std::string raw_headers("HTTP/1.1 200 OK\n"
-                          "Last-Modified: something\n"
-                          "ETag: \"foo\"\n"
-                          "Accept-Ranges: bytes\n"
-                          "Content-Length: 10\n");
-  CreateTruncatedEntry(raw_headers, &cache);
-
-  // Now make a range request.
-  std::string headers;
-  RunTransactionTestWithResponse(cache.http_cache(), kRangeGET_TransactionOK,
-                                 &headers);
-
-  Verify206Response(headers, 40, 49);
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  RemoveMockTransaction(&kRangeGET_TransactionOK);
-}
-
-TEST(HttpCache, SyncRead) {
-  MockHttpCache cache;
-
-  // This test ensures that a read that completes synchronously does not cause
-  // any problems.
-
-  ScopedMockTransaction transaction(kSimpleGET_Transaction);
-  transaction.test_mode |= (TEST_MODE_SYNC_CACHE_START |
-                            TEST_MODE_SYNC_CACHE_READ |
-                            TEST_MODE_SYNC_CACHE_WRITE);
-
-  MockHttpRequest r1(transaction),
-                  r2(transaction),
-                  r3(transaction);
-
-  TestTransactionConsumer c1(cache.http_cache()),
-                          c2(cache.http_cache()),
-                          c3(cache.http_cache());
-
-  c1.Start(&r1, net::BoundNetLog());
-
-  r2.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-  c2.Start(&r2, net::BoundNetLog());
-
-  r3.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-  c3.Start(&r3, net::BoundNetLog());
-
-  MessageLoop::current()->Run();
-
-  EXPECT_TRUE(c1.is_done());
-  EXPECT_TRUE(c2.is_done());
-  EXPECT_TRUE(c3.is_done());
-
-  EXPECT_EQ(net::OK, c1.error());
-  EXPECT_EQ(net::OK, c2.error());
-  EXPECT_EQ(net::OK, c3.error());
-}
-
-TEST(HttpCache, ValidationResultsIn200) {
-  MockHttpCache cache;
-
-  // This test ensures that a conditional request, which results in a 200
-  // instead of a 304, properly truncates the existing response data.
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kETagGET_Transaction);
-
-  // force this transaction to validate the cache
-  MockTransaction transaction(kETagGET_Transaction);
-  transaction.load_flags |= net::LOAD_VALIDATE_CACHE;
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  // read from the cache
-  RunTransactionTest(cache.http_cache(), kETagGET_Transaction);
-}
-
-TEST(HttpCache, CachedRedirect) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction kTestTransaction(kSimpleGET_Transaction);
-  kTestTransaction.status = "HTTP/1.1 301 Moved Permanently";
-  kTestTransaction.response_headers = "Location: http://www.bar.com/\n";
-
-  MockHttpRequest request(kTestTransaction);
-  TestOldCompletionCallback callback;
-
-  // write to the cache
-  {
-    scoped_ptr<net::HttpTransaction> trans;
-    int rv = cache.http_cache()->CreateTransaction(&trans);
-    EXPECT_EQ(net::OK, rv);
-    ASSERT_TRUE(trans.get());
-
-    rv = trans->Start(&request, &callback, net::BoundNetLog());
-    if (rv == net::ERR_IO_PENDING)
-      rv = callback.WaitForResult();
-    ASSERT_EQ(net::OK, rv);
-
-    const net::HttpResponseInfo* info = trans->GetResponseInfo();
-    ASSERT_TRUE(info);
-
-    EXPECT_EQ(info->headers->response_code(), 301);
-
-    std::string location;
-    info->headers->EnumerateHeader(NULL, "Location", &location);
-    EXPECT_EQ(location, "http://www.bar.com/");
-
-    // Destroy transaction when going out of scope. We have not actually
-    // read the response body -- want to test that it is still getting cached.
+int MockBlockingBackendFactory::CreateBackend(
+    net::NetLog* net_log, disk_cache::Backend** backend,
+    net::OldCompletionCallback* callback) {
+  if (!block_) {
+    if (!fail_)
+      *backend = new MockDiskCache();
+    return Result();
   }
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
 
-  // read from the cache
-  {
-    scoped_ptr<net::HttpTransaction> trans;
-    int rv = cache.http_cache()->CreateTransaction(&trans);
-    EXPECT_EQ(net::OK, rv);
-    ASSERT_TRUE(trans.get());
-
-    rv = trans->Start(&request, &callback, net::BoundNetLog());
-    if (rv == net::ERR_IO_PENDING)
-      rv = callback.WaitForResult();
-    ASSERT_EQ(net::OK, rv);
-
-    const net::HttpResponseInfo* info = trans->GetResponseInfo();
-    ASSERT_TRUE(info);
-
-    EXPECT_EQ(info->headers->response_code(), 301);
-
-    std::string location;
-    info->headers->EnumerateHeader(NULL, "Location", &location);
-    EXPECT_EQ(location, "http://www.bar.com/");
-
-    // Destroy transaction when going out of scope. We have not actually
-    // read the response body -- want to test that it is still getting cached.
-  }
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
+  backend_ =  backend;
+  callback_ = callback;
+  return net::ERR_IO_PENDING;
 }
 
-TEST(HttpCache, CacheControlNoStore) {
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kSimpleGET_Transaction);
-  transaction.response_headers = "cache-control: no-store\n";
-
-  // initial load
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // try loading again; it should result in a network fetch
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-
-  disk_cache::Entry* entry;
-  EXPECT_FALSE(cache.OpenBackendEntry(transaction.url, &entry));
-}
-
-TEST(HttpCache, CacheControlNoStore2) {
-  // this test is similar to the above test, except that the initial response
-  // is cachable, but when it is validated, no-store is received causing the
-  // cached document to be deleted.
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-
-  // initial load
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // try loading again; it should result in a network fetch
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.response_headers = "cache-control: no-store\n";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  disk_cache::Entry* entry;
-  EXPECT_FALSE(cache.OpenBackendEntry(transaction.url, &entry));
-}
-
-TEST(HttpCache, CacheControlNoStore3) {
-  // this test is similar to the above test, except that the response is a 304
-  // instead of a 200.  this should never happen in practice, but it seems like
-  // a good thing to verify that we still destroy the cache entry.
-  MockHttpCache cache;
-
-  ScopedMockTransaction transaction(kETagGET_Transaction);
-
-  // initial load
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  // try loading again; it should result in a network fetch
-  transaction.load_flags = net::LOAD_VALIDATE_CACHE;
-  transaction.response_headers = "cache-control: no-store\n";
-  transaction.status = "HTTP/1.1 304 Not Modified";
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-
-  disk_cache::Entry* entry;
-  EXPECT_FALSE(cache.OpenBackendEntry(transaction.url, &entry));
-}
-
-// Ensure that we don't cache requests served over bad HTTPS.
-TEST(HttpCache, SimpleGET_SSLError) {
-  MockHttpCache cache;
-
-  MockTransaction transaction = kSimpleGET_Transaction;
-  transaction.cert_status = net::CERT_STATUS_REVOKED;
-  ScopedMockTransaction scoped_transaction(transaction);
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  // Test that it was not cached.
-  transaction.load_flags |= net::LOAD_ONLY_FROM_CACHE;
-
-  MockHttpRequest request(transaction);
-  TestOldCompletionCallback callback;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache.http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-  ASSERT_TRUE(trans.get());
-
-  rv = trans->Start(&request, &callback, net::BoundNetLog());
-  if (rv == net::ERR_IO_PENDING)
-    rv = callback.WaitForResult();
-  ASSERT_EQ(net::ERR_CACHE_MISS, rv);
-}
-
-// Ensure that we don't crash by if left-behind transactions.
-TEST(HttpCache, OutlivedTransactions) {
-  MockHttpCache* cache = new MockHttpCache;
-
-  scoped_ptr<net::HttpTransaction> trans;
-  int rv = cache->http_cache()->CreateTransaction(&trans);
-  EXPECT_EQ(net::OK, rv);
-
-  delete cache;
-  trans.reset();
-}
-
-// Test that the disabled mode works.
-TEST(HttpCache, CacheDisabledMode) {
-  MockHttpCache cache;
-
-  // write to the cache
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  // go into disabled mode
-  cache.http_cache()->set_mode(net::HttpCache::DISABLE);
-
-  // force this transaction to write to the cache again
-  MockTransaction transaction(kSimpleGET_Transaction);
-
-  RunTransactionTest(cache.http_cache(), transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-// Other tests check that the response headers of the cached response
-// get updated on 304. Here we specifically check that the
-// HttpResponseHeaders::request_time and HttpResponseHeaders::response_time
-// fields also gets updated.
-// http://crbug.com/20594.
-TEST(HttpCache, UpdatesRequestResponseTimeOn304) {
-  MockHttpCache cache;
-
-  const char* kUrl = "http://foobar";
-  const char* kData = "body";
-
-  MockTransaction mock_network_response = { 0 };
-  mock_network_response.url = kUrl;
-
-  AddMockTransaction(&mock_network_response);
-
-  // Request |kUrl|, causing |kNetResponse1| to be written to the cache.
-
-  MockTransaction request = { 0 };
-  request.url = kUrl;
-  request.method = "GET";
-  request.request_headers = "";
-  request.data = kData;
-
-  static const Response kNetResponse1 = {
-    "HTTP/1.1 200 OK",
-    "Date: Fri, 12 Jun 2009 21:46:42 GMT\n"
-    "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-    kData
-  };
-
-  kNetResponse1.AssignTo(&mock_network_response);
-
-  RunTransactionTest(cache.http_cache(), request);
-
-  // Request |kUrl| again, this time validating the cache and getting
-  // a 304 back.
-
-  request.load_flags = net::LOAD_VALIDATE_CACHE;
-
-  static const Response kNetResponse2 = {
-    "HTTP/1.1 304 Not Modified",
-    "Date: Wed, 22 Jul 2009 03:15:26 GMT\n",
-    ""
-  };
-
-  kNetResponse2.AssignTo(&mock_network_response);
-
-  base::Time request_time = base::Time() + base::TimeDelta::FromHours(1234);
-  base::Time response_time = base::Time() + base::TimeDelta::FromHours(1235);
-
-  mock_network_response.request_time = request_time;
-  mock_network_response.response_time = response_time;
-
-  net::HttpResponseInfo response;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), request, &response);
-
-  // The request and response times should have been updated.
-  EXPECT_EQ(request_time.ToInternalValue(),
-            response.request_time.ToInternalValue());
-  EXPECT_EQ(response_time.ToInternalValue(),
-            response.response_time.ToInternalValue());
-
-  std::string headers;
-  response.headers->GetNormalizedHeaders(&headers);
-
-  EXPECT_EQ("HTTP/1.1 200 OK\n"
-            "Date: Wed, 22 Jul 2009 03:15:26 GMT\n"
-            "Last-Modified: Wed, 06 Feb 2008 22:38:21 GMT\n",
-            headers);
-
-  RemoveMockTransaction(&mock_network_response);
-}
-
-// Tests that we can write metadata to an entry.
-TEST(HttpCache, WriteMetadata_OK) {
-  MockHttpCache cache;
-
-  // Write to the cache
-  net::HttpResponseInfo response;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), kSimpleGET_Transaction,
-                                     &response);
-  EXPECT_TRUE(response.metadata.get() == NULL);
-
-  // Trivial call.
-  cache.http_cache()->WriteMetadata(GURL("foo"), Time::Now(), NULL, 0);
-
-  // Write meta data to the same entry.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(50));
-  memset(buf->data(), 0, buf->size());
-  base::strlcpy(buf->data(), "Hi there", buf->size());
-  cache.http_cache()->WriteMetadata(GURL(kSimpleGET_Transaction.url),
-                                    response.response_time, buf, buf->size());
-
-  // Release the buffer before the operation takes place.
-  buf = NULL;
-
-  // Makes sure we finish pending operations.
-  MessageLoop::current()->RunAllPending();
-
-  RunTransactionTestWithResponseInfo(cache.http_cache(), kSimpleGET_Transaction,
-                                     &response);
-  ASSERT_TRUE(response.metadata.get() != NULL);
-  EXPECT_EQ(50, response.metadata->size());
-  EXPECT_EQ(0, strcmp(response.metadata->data(), "Hi there"));
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-// Tests that we only write metadata to an entry if the time stamp matches.
-TEST(HttpCache, WriteMetadata_Fail) {
-  MockHttpCache cache;
-
-  // Write to the cache
-  net::HttpResponseInfo response;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), kSimpleGET_Transaction,
-                                     &response);
-  EXPECT_TRUE(response.metadata.get() == NULL);
-
-  // Attempt to write meta data to the same entry.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(50));
-  memset(buf->data(), 0, buf->size());
-  base::strlcpy(buf->data(), "Hi there", buf->size());
-  base::Time expected_time = response.response_time -
-                             base::TimeDelta::FromMilliseconds(20);
-  cache.http_cache()->WriteMetadata(GURL(kSimpleGET_Transaction.url),
-                                    expected_time, buf, buf->size());
-
-  // Makes sure we finish pending operations.
-  MessageLoop::current()->RunAllPending();
-
-  RunTransactionTestWithResponseInfo(cache.http_cache(), kSimpleGET_Transaction,
-                                     &response);
-  EXPECT_TRUE(response.metadata.get() == NULL);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-// Tests that we can read metadata after validating the entry and with READ mode
-// transactions.
-TEST(HttpCache, ReadMetadata) {
-  MockHttpCache cache;
-
-  // Write to the cache
-  net::HttpResponseInfo response;
-  RunTransactionTestWithResponseInfo(cache.http_cache(),
-                                     kTypicalGET_Transaction, &response);
-  EXPECT_TRUE(response.metadata.get() == NULL);
-
-  // Write meta data to the same entry.
-  scoped_refptr<net::IOBufferWithSize> buf(new net::IOBufferWithSize(50));
-  memset(buf->data(), 0, buf->size());
-  base::strlcpy(buf->data(), "Hi there", buf->size());
-  cache.http_cache()->WriteMetadata(GURL(kTypicalGET_Transaction.url),
-                                    response.response_time, buf, buf->size());
-
-  // Makes sure we finish pending operations.
-  MessageLoop::current()->RunAllPending();
-
-  // Start with a READ mode transaction.
-  MockTransaction trans1(kTypicalGET_Transaction);
-  trans1.load_flags = net::LOAD_ONLY_FROM_CACHE;
-
-  RunTransactionTestWithResponseInfo(cache.http_cache(), trans1, &response);
-  ASSERT_TRUE(response.metadata.get() != NULL);
-  EXPECT_EQ(50, response.metadata->size());
-  EXPECT_EQ(0, strcmp(response.metadata->data(), "Hi there"));
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(2, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  MessageLoop::current()->RunAllPending();
-
-  // Now make sure that the entry is re-validated with the server.
-  trans1.load_flags = net::LOAD_VALIDATE_CACHE;
-  trans1.status = "HTTP/1.1 304 Not Modified";
-  AddMockTransaction(&trans1);
-
-  response.metadata = NULL;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), trans1, &response);
-  EXPECT_TRUE(response.metadata.get() != NULL);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(3, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-  MessageLoop::current()->RunAllPending();
-  RemoveMockTransaction(&trans1);
-
-  // Now return 200 when validating the entry so the metadata will be lost.
-  MockTransaction trans2(kTypicalGET_Transaction);
-  trans2.load_flags = net::LOAD_VALIDATE_CACHE;
-  RunTransactionTestWithResponseInfo(cache.http_cache(), trans2, &response);
-  EXPECT_TRUE(response.metadata.get() == NULL);
-
-  EXPECT_EQ(3, cache.network_layer()->transaction_count());
-  EXPECT_EQ(4, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
-}
-
-// Tests that we don't mark entries as truncated when a filter detects the end
-// of the stream.
-TEST(HttpCache, FilterCompletion) {
-  MockHttpCache cache;
-  TestOldCompletionCallback callback;
-
-  {
-    scoped_ptr<net::HttpTransaction> trans;
-    int rv = cache.http_cache()->CreateTransaction(&trans);
-    EXPECT_EQ(net::OK, rv);
-
-    MockHttpRequest request(kSimpleGET_Transaction);
-    rv = trans->Start(&request, &callback, net::BoundNetLog());
-    EXPECT_EQ(net::OK, callback.GetResult(rv));
-
-    scoped_refptr<net::IOBuffer> buf(new net::IOBuffer(256));
-    rv = trans->Read(buf, 256, &callback);
-    EXPECT_GT(callback.GetResult(rv), 0);
-
-    // Now make sure that the entry is preserved.
-    trans->DoneReading();
+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.
   }
-
-  // Make sure that the ActiveEntry is gone.
-  MessageLoop::current()->RunAllPending();
-
-  // Read from the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(1, cache.network_layer()->transaction_count());
-  EXPECT_EQ(1, cache.disk_cache()->open_count());
-  EXPECT_EQ(1, cache.disk_cache()->create_count());
 }
-
-// Tests that we detect truncated rersources from the net when there is
-// a Content-Length header.
-TEST(HttpCache, TruncatedByContentLength) {
-  MockHttpCache cache;
-  TestOldCompletionCallback callback;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  AddMockTransaction(&transaction);
-  transaction.response_headers = "Cache-Control: max-age=10000\n"
-                                 "Content-Length: 100\n";
-  RunTransactionTest(cache.http_cache(), transaction);
-  RemoveMockTransaction(&transaction);
-
-  // Read from the cache.
-  RunTransactionTest(cache.http_cache(), kSimpleGET_Transaction);
-
-  EXPECT_EQ(2, cache.network_layer()->transaction_count());
-  EXPECT_EQ(0, cache.disk_cache()->open_count());
-  EXPECT_EQ(2, cache.disk_cache()->create_count());
-}
-
-// Tests that we actually flag entries as truncated when we detect an error
-// from the net.
-TEST(HttpCache, TruncatedByContentLength2) {
-  MockHttpCache cache;
-  TestOldCompletionCallback callback;
-
-  MockTransaction transaction(kSimpleGET_Transaction);
-  AddMockTransaction(&transaction);
-  transaction.response_headers = "Cache-Control: max-age=10000\n"
-                                 "Content-Length: 100\n"
-                                 "Etag: foo\n";
-  RunTransactionTest(cache.http_cache(), transaction);
-  RemoveMockTransaction(&transaction);
-
-  // Verify that the entry is marked as incomplete.
-  disk_cache::Entry* entry;
-  ASSERT_TRUE(cache.OpenBackendEntry(kSimpleGET_Transaction.url, &entry));
-  net::HttpResponseInfo response;
-  bool truncated = false;
-  EXPECT_TRUE(MockHttpCache::ReadResponseInfo(entry, &response, &truncated));
-  EXPECT_TRUE(truncated);
-  entry->Close();
-}
-
-//-----------------------------------------------------------------------------
-// DiskCacheBasedSSLHostInfo tests
-
-class DeleteSSLHostInfoOldCompletionCallback : public TestOldCompletionCallback {
- public:
-  explicit DeleteSSLHostInfoOldCompletionCallback(net::SSLHostInfo* ssl_host_info)
-      : ssl_host_info_(ssl_host_info) {}
-
-  virtual void RunWithParams(const Tuple1<int>& params) {
-    delete ssl_host_info_;
-    TestOldCompletionCallback::RunWithParams(params);
-  }
-
- private:
-  net::SSLHostInfo* ssl_host_info_;
-};
-
-// Tests that we can delete a DiskCacheBasedSSLHostInfo object in a
-// completion callback for DiskCacheBasedSSLHostInfo::WaitForDataReady.
-TEST(DiskCacheBasedSSLHostInfo, DeleteInCallback) {
-  net::CertVerifier cert_verifier;
-  // Use the blocking mock backend factory to force asynchronous completion
-  // of ssl_host_info->WaitForDataReady(), so that the callback will run.
-  MockBlockingBackendFactory* factory = new MockBlockingBackendFactory();
-  MockHttpCache cache(factory);
-  net::SSLConfig ssl_config;
-  net::SSLHostInfo* ssl_host_info =
-      new net::DiskCacheBasedSSLHostInfo("https://www.verisign.com", ssl_config,
-                                         &cert_verifier, cache.http_cache());
-  ssl_host_info->Start();
-  DeleteSSLHostInfoOldCompletionCallback callback(ssl_host_info);
-  int rv = ssl_host_info->WaitForDataReady(&callback);
-  EXPECT_EQ(net::ERR_IO_PENDING, rv);
-  // Now complete the backend creation and let the callback run.
-  factory->FinishCreation();
-  EXPECT_EQ(net::OK, callback.GetResult(rv));
-}