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

Unified Diff: chrome/common/sqlite_utils.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/common/net/url_fetcher.cc ('k') | chrome/common/webmessageportchannel_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/sqlite_utils.cc
diff --git a/chrome/common/sqlite_utils.cc b/chrome/common/sqlite_utils.cc
index 9d16c7fe086276db20ae37a21a82d94997fd1b27..15ae2c28fc3f2900e75c56008914137a0dc5068d 100644
--- a/chrome/common/sqlite_utils.cc
+++ b/chrome/common/sqlite_utils.cc
@@ -7,11 +7,11 @@
#include <list>
#include "base/file_path.h"
-#include "base/lock.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
#include "base/string16.h"
+#include "base/synchronization/lock.h"
// The vanilla error handler implements the common fucntionality for all the
// error handlers. Specialized error handlers are expected to only override
@@ -67,13 +67,13 @@ class DefaultSQLErrorHandlerFactory : public SQLErrorHandlerFactory {
private:
void AddHandler(SQLErrorHandler* handler) {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
errors_.push_back(handler);
}
typedef std::list<SQLErrorHandler*> ErrorList;
ErrorList errors_;
- Lock lock_;
+ base::Lock lock_;
};
static base::LazyInstance<DefaultSQLErrorHandlerFactory>
« no previous file with comments | « chrome/common/net/url_fetcher.cc ('k') | chrome/common/webmessageportchannel_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698