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

Unified Diff: chrome/test/sync/engine/mock_connection_manager.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/test/sync/engine/mock_connection_manager.h ('k') | chrome/test/webdriver/session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/sync/engine/mock_connection_manager.cc
diff --git a/chrome/test/sync/engine/mock_connection_manager.cc b/chrome/test/sync/engine/mock_connection_manager.cc
index ade90a6fef40f02f57d2648b5ebd41f596e5c935..f56cdeb9c742b7d57812470ef6e1b5ac452b6d61 100644
--- a/chrome/test/sync/engine/mock_connection_manager.cc
+++ b/chrome/test/sync/engine/mock_connection_manager.cc
@@ -138,7 +138,7 @@ bool MockConnectionManager::PostBufferToPath(const PostBufferParams* params,
}
{
- AutoLock lock(response_code_override_lock_);
+ base::AutoLock lock(response_code_override_lock_);
if (throttling_) {
response.set_error_code(ClientToServerResponse::THROTTLED);
throttling_ = false;
@@ -501,7 +501,7 @@ const CommitResponse& MockConnectionManager::last_commit_response() const {
void MockConnectionManager::ThrottleNextRequest(
ResponseCodeOverrideRequestor* visitor) {
- AutoLock lock(response_code_override_lock_);
+ base::AutoLock lock(response_code_override_lock_);
throttling_ = true;
if (visitor)
visitor->OnOverrideComplete();
@@ -509,7 +509,7 @@ void MockConnectionManager::ThrottleNextRequest(
void MockConnectionManager::FailWithAuthInvalid(
ResponseCodeOverrideRequestor* visitor) {
- AutoLock lock(response_code_override_lock_);
+ base::AutoLock lock(response_code_override_lock_);
fail_with_auth_invalid_ = true;
if (visitor)
visitor->OnOverrideComplete();
@@ -517,7 +517,7 @@ void MockConnectionManager::FailWithAuthInvalid(
void MockConnectionManager::StopFailingWithAuthInvalid(
ResponseCodeOverrideRequestor* visitor) {
- AutoLock lock(response_code_override_lock_);
+ base::AutoLock lock(response_code_override_lock_);
fail_with_auth_invalid_ = false;
if (visitor)
visitor->OnOverrideComplete();
« no previous file with comments | « chrome/test/sync/engine/mock_connection_manager.h ('k') | chrome/test/webdriver/session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698