Revert "Move mojo edk into mojo/edk"

mojo/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 "mojo/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"
+#include "mojo/system/channel.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/transport_data.h"
 
 namespace mojo {
 namespace system {
 
 ChannelEndpoint::ChannelEndpoint(MessagePipe* message_pipe, unsigned port)
     : state_(STATE_NORMAL),
       message_pipe_(message_pipe),
       port_(port),
       channel_(),
       local_id_(MessageInTransit::kInvalidEndpointId),
@@ skipping 153 matching lines @@
   DCHECK_NE(remote_id_, MessageInTransit::kInvalidEndpointId);
 
   message->SerializeAndCloseDispatchers(channel_);
   message->set_source_id(local_id_);
   message->set_destination_id(remote_id_);
   return channel_->WriteMessage(message.Pass());
 }
 
 }  // namespace system
 }  // namespace mojo