diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 00:52:53 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 00:52:53 +0000 |
| commit | ced98e85c44530db92d01a561595f53132e5de49 (patch) | |
| tree | 674989ea11ad354a1eea0e3231cd9e4f6611d60d /net/disk_cache | |
| parent | 3553da72e072a9f3a19c4662519a57f1e0d34d83 (diff) | |
| download | chromium_src-ced98e85c44530db92d01a561595f53132e5de49.zip chromium_src-ced98e85c44530db92d01a561595f53132e5de49.tar.gz chromium_src-ced98e85c44530db92d01a561595f53132e5de49.tar.bz2 | |
Disk cache: Modify when we report empty cache files.
BUG=none
TEST=none
TBR=gavinp
Review URL: https://chromiumcodereview.appspot.com/10317023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index d4ccd24..8ed1a4e 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -450,7 +450,7 @@ int BackendImpl::SyncInit() { return net::ERR_FAILED; } - if (create_files || !data_->header.num_entries) + if (!restarted_ && (create_files || !data_->header.num_entries)) ReportError(ERR_CACHE_CREATED); if (!(user_flags_ & kNoRandom) && @@ -465,12 +465,8 @@ int BackendImpl::SyncInit() { if (!data_->header.this_id) data_->header.this_id++; - if (data_->header.crash) { - ReportError(ERR_PREVIOUS_CRASH); - } else { - ReportError(ERR_NO_ERROR); - data_->header.crash = 1; - } + bool previous_crash = (data_->header.crash != 0); + data_->header.crash = 1; if (!block_files_.Init(create_files)) return net::ERR_FAILED; @@ -501,6 +497,12 @@ int BackendImpl::SyncInit() { trace_object_->EnableTracing(true); #endif + if (previous_crash) { + ReportError(ERR_PREVIOUS_CRASH); + } else if (!restarted_) { + ReportError(ERR_NO_ERROR); + } + return disabled_ ? net::ERR_FAILED : net::OK; } |