summaryrefslogtreecommitdiffstats
path: root/net/http/mock_http_cache.cc
diff options
context:
space:
mode:
authorrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 19:57:29 +0000
committerrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 19:57:29 +0000
commit6a019de2f514cef00f2c07a8bffa626942ea4fdb (patch)
tree1374412cfc8bbd853144c62361e536031f77e457 /net/http/mock_http_cache.cc
parent3913ee116406072aba6df0db4a7f81bff77a5a0c (diff)
downloadchromium_src-6a019de2f514cef00f2c07a8bffa626942ea4fdb.zip
chromium_src-6a019de2f514cef00f2c07a8bffa626942ea4fdb.tar.gz
chromium_src-6a019de2f514cef00f2c07a8bffa626942ea4fdb.tar.bz2
SSL Host info: Make sure that we can update certificate chains in
the cache. BUG=102554 TEST=net_unittests Review URL: http://codereview.chromium.org/8670009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/mock_http_cache.cc')
-rw-r--r--net/http/mock_http_cache.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc
index 181e104..98efd70 100644
--- a/net/http/mock_http_cache.cc
+++ b/net/http/mock_http_cache.cc
@@ -341,7 +341,7 @@ class MockDiskCache::CallbackRunner : public Task {
MockDiskCache::MockDiskCache()
: open_count_(0), create_count_(0), fail_requests_(false),
- soft_failures_(false) {
+ soft_failures_(false), double_create_check_(true) {
}
MockDiskCache::~MockDiskCache() {
@@ -392,7 +392,12 @@ int MockDiskCache::CreateEntry(const std::string& key,
EntryMap::iterator it = entries_.find(key);
if (it != entries_.end()) {
- DCHECK(it->second->is_doomed());
+ if (!it->second->is_doomed()) {
+ if (double_create_check_)
+ NOTREACHED();
+ else
+ return net::ERR_CACHE_CREATE_FAILURE;
+ }
it->second->Release();
entries_.erase(it);
}