Mojo: Minor cleanup (of message_in_transit.cc and message_pipe.*).

mojo/system/message_pipe.h

 // Copyright 2013 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.
 
 #ifndef MOJO_SYSTEM_MESSAGE_PIPE_H_
 #define MOJO_SYSTEM_MESSAGE_PIPE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 53 matching lines @@
   MojoResult AddWaiter(unsigned port,
                        Waiter* waiter,
                        MojoWaitFlags flags,
                        MojoResult wake_result);
   void RemoveWaiter(unsigned port, Waiter* waiter);
 
   // This is called by the dispatcher to convert a local endpoint to a proxy
   // endpoint.
   void ConvertLocalToProxy(unsigned port);
 
-  // This is used internally by |WriteMessage()| and by |Channel| to enqueue
-  // messages (typically to a |LocalMessagePipeEndpoint|). Unlike
-  // |WriteMessage()|, |port| is the *destination* port. |transports| should be
-  // non-null only if it's nonempty, and only if |message| has no dispatchers
-  // attached.
+  // This is used by |Channel| to enqueue messages (typically to a
+  // |LocalMessagePipeEndpoint|). Unlike |WriteMessage()|, |port| is the
+  // *destination* port.
   MojoResult EnqueueMessage(unsigned port,
-                            scoped_ptr<MessageInTransit> message,
-                            std::vector<DispatcherTransport>* transports);
+                            scoped_ptr<MessageInTransit> message);
 
   // These are used by |Channel|.
   bool Attach(unsigned port,
               scoped_refptr<Channel> channel,
               MessageInTransit::EndpointId local_id);
   void Run(unsigned port, MessageInTransit::EndpointId remote_id);
   void OnRemove(unsigned port);
 
  private:
   friend class base::RefCountedThreadSafe<MessagePipe>;
   virtual ~MessagePipe();
 
-  // Used by |EnqueueMessage()| to handle control messages that are actually
-  // meant for us.
+  // This is used internally by |WriteMessage()| and by |EnqueueMessage()|.
+  // |transports| may be non-null only if it's nonempty and |message| has no
+  // dispatchers attached.
+  MojoResult EnqueueMessageInternal(
+      unsigned port,
+      scoped_ptr<MessageInTransit> message,
+      std::vector<DispatcherTransport>* transports);
+
+  // Helper for |EnqueueMessageInternal()|. Must be called with |lock_| held.
+  MojoResult AttachTransportsNoLock(
+      unsigned port,
+      MessageInTransit* message,
+      std::vector<DispatcherTransport>* transports);
+
+  // Used by |EnqueueMessageInternal()| to handle control messages that are
+  // actually meant for us.
   MojoResult HandleControlMessage(unsigned port,
                                   scoped_ptr<MessageInTransit> message);
 
   base::Lock lock_;  // Protects the following members.
   scoped_ptr<MessagePipeEndpoint> endpoints_[2];
 
   DISALLOW_COPY_AND_ASSIGN(MessagePipe);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_SYSTEM_MESSAGE_PIPE_H_