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

Unified Diff: chrome/browser/device_orientation/provider_unittest.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/cross_site_request_manager.cc ('k') | chrome/browser/download/download_file_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/device_orientation/provider_unittest.cc
diff --git a/chrome/browser/device_orientation/provider_unittest.cc b/chrome/browser/device_orientation/provider_unittest.cc
index a84de5bc7c22589285f59c039a7e11ead302fcf8..131504a8103301fd29dcba900061ea9bc34efca4 100644
--- a/chrome/browser/device_orientation/provider_unittest.cc
+++ b/chrome/browser/device_orientation/provider_unittest.cc
@@ -4,8 +4,8 @@
#include <queue>
-#include "base/lock.h"
#include "base/message_loop.h"
+#include "base/synchronization/lock.h"
#include "base/task.h"
#include "chrome/browser/device_orientation/data_fetcher.h"
#include "chrome/browser/device_orientation/orientation.h"
@@ -78,7 +78,7 @@ class MockOrientationFactory : public base::RefCounted<MockOrientationFactory> {
}
void SetOrientation(const Orientation& orientation) {
- AutoLock auto_lock(lock_);
+ base::AutoLock auto_lock(lock_);
orientation_ = orientation;
}
@@ -91,7 +91,7 @@ class MockOrientationFactory : public base::RefCounted<MockOrientationFactory> {
// From DataFetcher. Called by the Provider.
virtual bool GetOrientation(Orientation* orientation) {
- AutoLock auto_lock(orientation_factory_->lock_);
+ base::AutoLock auto_lock(orientation_factory_->lock_);
*orientation = orientation_factory_->orientation_;
return true;
}
@@ -102,7 +102,7 @@ class MockOrientationFactory : public base::RefCounted<MockOrientationFactory> {
static MockOrientationFactory* instance_;
Orientation orientation_;
- Lock lock_;
+ base::Lock lock_;
};
MockOrientationFactory* MockOrientationFactory::instance_;
« no previous file with comments | « chrome/browser/cross_site_request_manager.cc ('k') | chrome/browser/download/download_file_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698