diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome/browser/safe_browsing/safe_browsing_database.cc | |
parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing/safe_browsing_database.cc')
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 9b4c57e..e717655 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -287,7 +287,7 @@ void SafeBrowsingDatabaseNew::Init(const FilePath& filename_base) { // until it returns, there are no pointers to this class on other // threads. Then again, that means there is no possibility of // contention on the lock... - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); DCHECK(browse_filename_.empty()); // Ensure we haven't been run before. DCHECK(download_filename_.empty()); // Ensure we haven't been run before. @@ -324,7 +324,7 @@ bool SafeBrowsingDatabaseNew::ResetDatabase() { // Reset objects in memory. { - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); full_browse_hashes_.clear(); pending_browse_hashes_.clear(); prefix_miss_cache_.clear(); @@ -355,7 +355,7 @@ bool SafeBrowsingDatabaseNew::ContainsBrowseUrl( // This function is called on the I/O thread, prevent changes to // bloom filter and caches. - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); if (!browse_bloom_filter_.get()) return false; @@ -607,7 +607,7 @@ void SafeBrowsingDatabaseNew::CacheHashResults( const std::vector<SBPrefix>& prefixes, const std::vector<SBFullHashResult>& full_hits) { // This is called on the I/O thread, lock against updates. - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); if (full_hits.empty()) { prefix_miss_cache_.insert(prefixes.begin(), prefixes.end()); @@ -729,7 +729,7 @@ void SafeBrowsingDatabaseNew::UpdateBrowseStore() { // case |ContainsBrowseURL()| is called before the new filter is complete. std::vector<SBAddFullHash> pending_add_hashes; { - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); pending_add_hashes.insert(pending_add_hashes.end(), pending_browse_hashes_.begin(), pending_browse_hashes_.end()); @@ -778,7 +778,7 @@ void SafeBrowsingDatabaseNew::UpdateBrowseStore() { // Swap in the newly built filter and cache. { - AutoLock locked(lookup_lock_); + base::AutoLock locked(lookup_lock_); full_browse_hashes_.swap(add_full_hashes); // TODO(shess): If |CacheHashResults()| is posted between the |