Revert "Move mojo edk into mojo/edk"

mojo/system/raw_channel.h

Index: mojo/system/raw_channel.h
diff --git a/mojo/edk/system/raw_channel.h b/mojo/system/raw_channel.h
similarity index 97%
rename from mojo/edk/system/raw_channel.h
rename to mojo/system/raw_channel.h
index 1a077efe1b74394d1f9666a1ddc1fdce132bffe7..c40f43c314069f2fce3565ba0369bfba55e0f4e9 100644
--- a/mojo/edk/system/raw_channel.h
+++ b/mojo/system/raw_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_RAW_CHANNEL_H_
-#define MOJO_EDK_SYSTEM_RAW_CHANNEL_H_
+#ifndef MOJO_SYSTEM_RAW_CHANNEL_H_
+#define MOJO_SYSTEM_RAW_CHANNEL_H_
 
 #include <deque>
 #include <vector>
@@ -12,11 +12,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
-#include "mojo/edk/embedder/platform_handle_vector.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/constants.h"
-#include "mojo/edk/system/message_in_transit.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/platform_handle_vector.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/constants.h"
+#include "mojo/system/message_in_transit.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class MessageLoopForIO;
@@ -328,4 +328,4 @@ class MOJO_SYSTEM_IMPL_EXPORT RawChannel {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_RAW_CHANNEL_H_
+#endif  // MOJO_SYSTEM_RAW_CHANNEL_H_