Revert "Move mojo edk into mojo/edk"

mojo/system/channel.h

Index: mojo/system/channel.h
diff --git a/mojo/edk/system/channel.h b/mojo/system/channel.h
similarity index 95%
rename from mojo/edk/system/channel.h
rename to mojo/system/channel.h
index bd66ca45630a3812d13dfd582d0b1667fd8dc87d..0be9999cc6da4b0baacc922b1296e0624f67a379 100644
--- a/mojo/edk/system/channel.h
+++ b/mojo/system/channel.h
@@ -2,8 +2,8 @@
 // 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_H_
-#define MOJO_EDK_SYSTEM_CHANNEL_H_
+#ifndef MOJO_SYSTEM_CHANNEL_H_
+#define MOJO_SYSTEM_CHANNEL_H_
 
 #include <stdint.h>
 
@@ -15,13 +15,13 @@
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/channel_endpoint.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/message_pipe.h"
-#include "mojo/edk/system/raw_channel.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/c/system/types.h"
+#include "mojo/system/channel_endpoint.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/message_pipe.h"
+#include "mojo/system/raw_channel.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 
@@ -190,4 +190,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_CHANNEL_H_
+#endif  // MOJO_SYSTEM_CHANNEL_H_