Revert of Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444

mojo/edk/system/channel_endpoint.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/channel_endpoint.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/message_pipe.h"
 #include "mojo/edk/system/transport_data.h"
@@ skipping 47 matching lines @@
     DCHECK(local_id_.is_valid());
     // TODO(vtl): Once we combine "run" into "attach", |remote_id_| should valid
     // here as well.
     channel_->DetachEndpoint(this, local_id_, remote_id_);
     channel_ = nullptr;
     local_id_ = ChannelEndpointId();
     remote_id_ = ChannelEndpointId();
   }
 }
 
+void ChannelEndpoint::AttachToChannel(Channel* channel,
+                                      ChannelEndpointId local_id) {
+  DCHECK(channel);
+  DCHECK(local_id.is_valid());
+
+  base::AutoLock locker(lock_);
+  DCHECK(!channel_);
+  DCHECK(!local_id_.is_valid());
+  channel_ = channel;
+  local_id_ = local_id;
+}
+
+void ChannelEndpoint::Run(ChannelEndpointId remote_id) {
+  DCHECK(remote_id.is_valid());
+
+  base::AutoLock locker(lock_);
+  if (!channel_)
+    return;
+
+  DCHECK(!remote_id_.is_valid());
+  remote_id_ = remote_id;
+
+  while (!paused_message_queue_.IsEmpty()) {
+    LOG_IF(WARNING, !WriteMessageNoLock(paused_message_queue_.GetMessage()))
+        << "Failed to write enqueue message to channel";
+  }
+}
+
 void ChannelEndpoint::AttachAndRun(Channel* channel,
                                    ChannelEndpointId local_id,
                                    ChannelEndpointId remote_id) {
   DCHECK(channel);
   DCHECK(local_id.is_valid());
   DCHECK(remote_id.is_valid());
 
   base::AutoLock locker(lock_);
   DCHECK(!channel_);
   DCHECK(!local_id_.is_valid());
@@ skipping 90 matching lines @@
   DCHECK(remote_id_.is_valid());
 
   message->SerializeAndCloseDispatchers(channel_);
   message->set_source_id(local_id_);
   message->set_destination_id(remote_id_);
   return channel_->WriteMessage(message.Pass());
 }
 
 }  // namespace system
 }  // namespace mojo