| 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 9655f9cfb9f769de2499e9d2a82fc5f3ffa5b7e9..96302163d6e90d83b8a347a8796c703f948b40fb 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::SetFilter(scoped_ptr<Filter> filter) {
 | 
| -  MutexLocker locker(&mutex_);
 | 
| +  base::AutoLock locker(lock_);
 | 
|    filter_ = filter.Pass();
 | 
|  }
 | 
|  
 | 
|  bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
 | 
|    DCHECK(message);
 | 
|  
 | 
| -  MutexLocker locker(&mutex_);
 | 
| +  base::AutoLock locker(lock_);
 | 
|  
 | 
|    // If we're no longer the client, then reject the message.
 | 
|    if (!endpoints_[port])
 | 
| @@ -59,7 +59,7 @@
 | 
|  }
 | 
|  
 | 
|  void EndpointRelayer::OnDetachFromChannel(unsigned port) {
 | 
| -  MutexLocker locker(&mutex_);
 | 
| +  base::AutoLock locker(lock_);
 | 
|  
 | 
|    if (endpoints_[port]) {
 | 
|      endpoints_[port]->DetachFromClient();
 | 
| 
 |