Convert some more |base::Lock|s to |mojo::system::Mutex|s.

mojo/edk/system/endpoint_relayer.cc

Index: mojo/edk/system/endpoint_relayer.cc
diff --git a/mojo/edk/system/endpoint_relayer.cc b/mojo/edk/system/endpoint_relayer.cc
index 96302163d6e90d83b8a347a8796c703f948b40fb..c672b6e17e2674ae5df64cfc294bf9c4af7d213d 100644
--- a/mojo/edk/system/endpoint_relayer.cc
+++ b/mojo/edk/system/endpoint_relayer.cc
@@ -21,7 +21,8 @@ unsigned EndpointRelayer::GetPeerPort(unsigned port) {
 }
 
 void EndpointRelayer::Init(ChannelEndpoint* endpoint0,
-                           ChannelEndpoint* endpoint1) {
+                           ChannelEndpoint* endpoint1)
+    MOJO_NO_THREAD_SAFETY_ANALYSIS {

[kulakowski, 2015/07/10 21:53:47]

I wonder if this pattern (having to make |Init| functions
MOJO_NO_THREAD_SAFETY_ANALYSIS) is a pattern to be documented somewhere? It
feels a bit more subtle than MOJO_GUARDED_BY.

   DCHECK(endpoint0);
   DCHECK(endpoint1);
   DCHECK(!endpoints_[0]);
@@ -31,14 +32,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 +60,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();