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

Unified Diff: remoting/protocol/protocol_test_client.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 | « remoting/protocol/jingle_session_manager.h ('k') | skia/ext/SkThread_chrome.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/protocol_test_client.cc
diff --git a/remoting/protocol/protocol_test_client.cc b/remoting/protocol/protocol_test_client.cc
index 6486331925cfc2e84e616e06b0926f06569f259e..5f64aa481c71eef7c9cd839d26682bd2ae7bdf1b 100644
--- a/remoting/protocol/protocol_test_client.cc
+++ b/remoting/protocol/protocol_test_client.cc
@@ -114,7 +114,7 @@ class ProtocolTestClient
scoped_refptr<JingleClient> client_;
scoped_refptr<JingleSessionManager> session_manager_;
ConnectionsList connections_;
- Lock connections_lock_;
+ base::Lock connections_lock_;
base::WaitableEvent closed_event_;
};
@@ -236,7 +236,7 @@ void ProtocolTestClient::Run(const std::string& username,
std::getline(std::cin, line);
{
- AutoLock auto_lock(connections_lock_);
+ base::AutoLock auto_lock(connections_lock_);
// Broadcast message to all clients.
for (ConnectionsList::iterator it = connections_.begin();
@@ -309,7 +309,7 @@ void ProtocolTestClient::OnNewSession(
session->SetStateChangeCallback(
NewCallback(test_connection, &ProtocolTestConnection::OnStateChange));
test_connection->Init(session);
- AutoLock auto_lock(connections_lock_);
+ base::AutoLock auto_lock(connections_lock_);
connections_.push_back(make_scoped_refptr(test_connection));
}
@@ -320,7 +320,7 @@ void ProtocolTestClient::OnFinishedClosing() {
void ProtocolTestClient::DestroyConnection(
scoped_refptr<ProtocolTestConnection> connection) {
connection->Close();
- AutoLock auto_lock(connections_lock_);
+ base::AutoLock auto_lock(connections_lock_);
for (ConnectionsList::iterator it = connections_.begin();
it != connections_.end(); ++it) {
if ((*it) == connection) {
« no previous file with comments | « remoting/protocol/jingle_session_manager.h ('k') | skia/ext/SkThread_chrome.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698