Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1947)

Unified Diff: chrome/browser/safe_browsing/safe_browsing_service.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.h ('k') | chrome/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index c4e8eff06e9fe51a515553c4d71acba962e08049..20b96494f4978632c29bf8a92f7fbc793073cec5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -577,7 +577,7 @@ void SafeBrowsingService::OnIOShutdown() {
}
bool SafeBrowsingService::DatabaseAvailable() const {
- AutoLock lock(database_lock_);
+ base::AutoLock lock(database_lock_);
return !closing_database_ && (database_ != NULL);
}
@@ -610,7 +610,7 @@ SafeBrowsingDatabase* SafeBrowsingService::GetDatabase() {
{
// Acquiring the lock here guarantees correct ordering between the writes to
// the new database object above, and the setting of |databse_| below.
- AutoLock lock(database_lock_);
+ base::AutoLock lock(database_lock_);
database_ = database;
}
@@ -814,7 +814,7 @@ void SafeBrowsingService::OnCloseDatabase() {
// of |database_| above and of |closing_database_| below, which ensures there
// won't be a window during which the IO thread falsely believes the database
// is available.
- AutoLock lock(database_lock_);
+ base::AutoLock lock(database_lock_);
closing_database_ = false;
}
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_service.h ('k') | chrome/browser/speech/speech_input_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698