diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 18:43:45 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 18:43:45 +0000 |
commit | c3d634d79a21a64038e5fcb1505904c554ece8ea (patch) | |
tree | cc5f5aabc6aeeb5d190fda5f8526050e093eda83 /chrome/browser/safe_browsing/safe_browsing_database_bloom.cc | |
parent | bb25dfd5d6354dd52f5f693269b807fd4f46161e (diff) | |
download | chromium_src-c3d634d79a21a64038e5fcb1505904c554ece8ea.zip chromium_src-c3d634d79a21a64038e5fcb1505904c554ece8ea.tar.gz chromium_src-c3d634d79a21a64038e5fcb1505904c554ece8ea.tar.bz2 |
The SafeBrowsing system had a bunch of plumbing for system resume that wasn't actually hooked to anything. Seems better to not have it than to have it look like it's doing something when it isn't.
BUG=25336
TEST=none
Review URL: http://codereview.chromium.org/347024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_database_bloom.cc')
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database_bloom.cc | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc index 53f46a4..9d5a42c 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc @@ -26,11 +26,6 @@ using base::TimeDelta; // database is reset. static const int kDatabaseVersion = 6; -// When we awake from a low power state, we try to avoid doing expensive disk -// operations for a few minutes to let the system page itself in and settle -// down. -static const int kOnResumeHoldupMs = 5 * 60 * 1000; // 5 minutes. - // The maximum staleness for a cached entry. static const int kMaxStalenessMinutes = 45; @@ -45,9 +40,7 @@ SafeBrowsingDatabaseBloom::SafeBrowsingDatabaseBloom() : db_(NULL), init_(false), ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)), - ALLOW_THIS_IN_INITIALIZER_LIST(resume_factory_(this)), - add_count_(0), - did_resume_(false) { + add_count_(0) { } SafeBrowsingDatabaseBloom::~SafeBrowsingDatabaseBloom() { @@ -1206,8 +1199,6 @@ bool SafeBrowsingDatabaseBloom::BuildSubFullHashCache(HashCache* sub_cache) { return true; } -// TODO(erikkay): should we call WaitAfterResume() inside any of the loops here? -// This is a pretty fast operation and it would be nice to let it finish. void SafeBrowsingDatabaseBloom::BuildBloomFilter() { #if defined(OS_WIN) // For measuring the amount of IO during the bloom filter build. @@ -1438,26 +1429,6 @@ void SafeBrowsingDatabaseBloom::OnHandleCorruptDatabase() { DCHECK(false) << "SafeBrowsing database was corrupt and reset"; } -void SafeBrowsingDatabaseBloom::HandleResume() { - did_resume_ = true; - MessageLoop::current()->PostDelayedTask( - FROM_HERE, - resume_factory_.NewRunnableMethod( - &SafeBrowsingDatabaseBloom::OnResumeDone), - kOnResumeHoldupMs); -} - -void SafeBrowsingDatabaseBloom::OnResumeDone() { - did_resume_ = false; -} - -void SafeBrowsingDatabaseBloom::WaitAfterResume() { - if (did_resume_) { - PlatformThread::Sleep(kOnResumeHoldupMs); - did_resume_ = false; - } -} - // This database is always synchronous since we don't need to worry about // blocking any incoming reads. void SafeBrowsingDatabaseBloom::SetSynchronous() { |