Update mojo sdk to rev 91d94d6993c9b0c4135a95687a7d541ce90629b

mojo/edk/system/channel_endpoint.h

 // 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.
 
 #ifndef MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
 #define MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 94 matching lines @@
 //         running since under the current scheme it wouldn't have a remote ID
 //         yet.]
 //       - Note that even if the local side is closed, it may still receive a
 //         "remove" message from the other side (if the other side is closed
 //         simultaneously, and both sides send "remove" messages). In that
 //         case, it must still remain alive until it receives the "remove
 //         ack" (and it must ack the "remove" message that it received).
 class MOJO_SYSTEM_IMPL_EXPORT ChannelEndpoint
     : public base::RefCountedThreadSafe<ChannelEndpoint> {
  public:
-  // TODO(vtl): More comments....
-  ChannelEndpoint(MessagePipe* message_pipe, unsigned port);
-
-  // Takes messages from the given |MessageInTransitQueue|. This must be called
-  // before this object is attached to a channel, and before anyone has a chance
-  // to enqueue any messages.
-  void TakeMessages(MessageInTransitQueue* message_queue);
+  // Constructor for a |ChannelEndpoint| attached to the given message pipe
+  // endpoint (specified by |message_pipe| and |port|). Optionally takes
+  // messages from |*message_queue| if |message_queue| is non-null.
+  //
+  // |message_pipe| may be null if this endpoint will never need to receive
+  // messages, in which case |message_queue| should not be null. In that case,
+  // this endpoint will simply send queued messages upon being attached to a
+  // |Channel| and immediately detach itself.
+  ChannelEndpoint(MessagePipe* message_pipe,
+                  unsigned port,
+                  MessageInTransitQueue* message_queue = nullptr);
 
   // Methods called by |MessagePipe| (via |ProxyMessagePipeEndpoint|):
 
   // TODO(vtl): This currently only works if we're "running". We'll move the
   // "paused message queue" here (will this be needed when we have
   // locally-allocated remote IDs?).
   bool EnqueueMessage(scoped_ptr<MessageInTransit> message);
 
   void DetachFromMessagePipe();
 
@@ skipping 19 matching lines @@
   // Called by |Channel| before it gives up its reference to this object.
   void DetachFromChannel();
 
  private:
   friend class base::RefCountedThreadSafe<ChannelEndpoint>;
   ~ChannelEndpoint();
 
   // Must be called with |lock_| held.
   bool WriteMessageNoLock(scoped_ptr<MessageInTransit> message);
 
-  // TODO(vtl): Move the things above under lock.
   // Protects the members below.
   base::Lock lock_;
 
   // |message_pipe_| must be valid whenever it is non-null. Before
   // |*message_pipe_| gives up its reference to this object, it must call
   // |DetachFromMessagePipe()|.
   // NOTE: This is a |scoped_refptr<>|, rather than a raw pointer, since the
   // |Channel| needs to keep the |MessagePipe| alive for the "proxy-proxy" case.
   // Possibly we'll be able to eliminate that case when we have full
   // multiprocess support.
@@ skipping 13 matching lines @@
   // messages.
   MessageInTransitQueue paused_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_