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

Unified Diff: third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc

Issue 1311043003: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
diff --git a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
index 96302163d6e90d83b8a347a8796c703f948b40fb..9655f9cfb9f769de2499e9d2a82fc5f3ffa5b7e9 100644
--- a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
+++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
@@ -31,14 +31,14 @@ void EndpointRelayer::Init(ChannelEndpoint* endpoint0,
}
void EndpointRelayer::SetFilter(scoped_ptr<Filter> filter) {
- base::AutoLock locker(lock_);
+ MutexLocker locker(&mutex_);
filter_ = filter.Pass();
}
bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
DCHECK(message);
- base::AutoLock locker(lock_);
+ MutexLocker locker(&mutex_);
// If we're no longer the client, then reject the message.
if (!endpoints_[port])
@@ -59,7 +59,7 @@ bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
}
void EndpointRelayer::OnDetachFromChannel(unsigned port) {
- base::AutoLock locker(lock_);
+ MutexLocker locker(&mutex_);
if (endpoints_[port]) {
endpoints_[port]->DetachFromClient();

Powered by Google App Engine
This is Rietveld 408576698