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

mojo/edk/system/endpoint_relayer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/endpoint_relayer.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/message_in_transit.h"
 
 namespace mojo {
 namespace system {
 
 EndpointRelayer::EndpointRelayer() {
 }
 
 // static
 unsigned EndpointRelayer::GetPeerPort(unsigned port) {
   DCHECK(port == 0 || port == 1);
   return port ^ 1;
 }
 
 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]);
   DCHECK(!endpoints_[1]);
   endpoints_[0] = endpoint0;
   endpoints_[1] = endpoint1;
 }
 
 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])
     return false;
 
   unsigned peer_port = GetPeerPort(port);
 
   if (filter_ && message->type() == MessageInTransit::Type::ENDPOINT_CLIENT) {
     if (filter_->OnReadMessage(endpoints_[port].get(),
                                endpoints_[peer_port].get(), message))
       return true;
   }
 
   // Otherwise, consume it even if the peer port is closed.
   if (endpoints_[peer_port])
     endpoints_[peer_port]->EnqueueMessage(make_scoped_ptr(message));
   return true;
 }
 
 void EndpointRelayer::OnDetachFromChannel(unsigned port) {
-  base::AutoLock locker(lock_);
+  MutexLocker locker(&mutex_);
 
   if (endpoints_[port]) {
     endpoints_[port]->DetachFromClient();
     endpoints_[port] = nullptr;
   }
 
   unsigned peer_port = GetPeerPort(port);
   if (endpoints_[peer_port]) {
     endpoints_[peer_port]->DetachFromClient();
     endpoints_[peer_port] = nullptr;
   }
 }
 
 EndpointRelayer::~EndpointRelayer() {
   DCHECK(!endpoints_[0]);
   DCHECK(!endpoints_[1]);
 }
 
 }  // namespace system
 }  // namespace mojo