diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 19:13:13 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 19:13:13 +0000 |
| commit | 0582cf15c0c941c3f78291466fce5d549d453189 (patch) | |
| tree | cb143692d49e5b3b4d87ca4a5d7dc5b3386e1ad3 | |
| parent | 13c909d2fcb5f3d0a6b19c3367fd1541cd8c45d0 (diff) | |
| download | chromium_src-0582cf15c0c941c3f78291466fce5d549d453189.zip chromium_src-0582cf15c0c941c3f78291466fce5d549d453189.tar.gz chromium_src-0582cf15c0c941c3f78291466fce5d549d453189.tar.bz2 | |
Disk cache: Handle clearing the memory cache when it is already empty.
BUG=114258
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9359047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122329 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/disk_cache/backend_unittest.cc | 2 | ||||
| -rw-r--r-- | net/disk_cache/mem_backend_impl.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 1e58945..fab1561 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc @@ -2196,6 +2196,8 @@ void DiskCacheBackendTest::BackendDoomAll() { ASSERT_EQ(2, cache_->GetEntryCount()); EXPECT_EQ(net::OK, DoomAllEntries()); ASSERT_EQ(0, cache_->GetEntryCount()); + + EXPECT_EQ(net::OK, DoomAllEntries()); } TEST_F(DiskCacheBackendTest, DoomAll) { diff --git a/net/disk_cache/mem_backend_impl.cc b/net/disk_cache/mem_backend_impl.cc index 37c3b2f..23c370d 100644 --- a/net/disk_cache/mem_backend_impl.cc +++ b/net/disk_cache/mem_backend_impl.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -296,8 +296,8 @@ bool MemBackendImpl::OpenNextEntry(void** iter, Entry** next_entry) { void MemBackendImpl::TrimCache(bool empty) { MemEntryImpl* next = rankings_.GetPrev(NULL); - - DCHECK(next); + if (!next) + return; int target_size = empty ? 0 : LowWaterAdjust(max_size_); while (current_size_ > target_size && next) { |