Revert of Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444

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 113 matching lines @@
 
   // 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();
 
   // Methods called by |Channel|:
 
+  // TODO(vtl): Remove these once we've switched over to |AttachAndRun()|.
+  void AttachToChannel(Channel* channel, ChannelEndpointId local_id);
+  void Run(ChannelEndpointId remote_id);
+
   // Called by |Channel| when it takes a reference to this object. It will send
   // all queue messages (in |paused_message_queue_|).
   // TODO(vtl): Maybe rename this "OnAttach"?
   void AttachAndRun(Channel* channel,
                     ChannelEndpointId local_id,
                     ChannelEndpointId remote_id);
 
   // Called by |Channel| when it receives a message for the message pipe.
   bool OnReadMessage(const MessageInTransit::View& message_view,
                      embedder::ScopedPlatformHandleVectorPtr platform_handles);
@@ skipping 41 matching lines @@
   // messages.
   MessageInTransitQueue paused_message_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelEndpoint);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_CHANNEL_ENDPOINT_H_