Revert "Move mojo edk into mojo/edk"

mojo/embedder/platform_channel_pair.h

Index: mojo/embedder/platform_channel_pair.h
diff --git a/mojo/edk/embedder/platform_channel_pair.h b/mojo/embedder/platform_channel_pair.h
similarity index 93%
rename from mojo/edk/embedder/platform_channel_pair.h
rename to mojo/embedder/platform_channel_pair.h
index d77c100dea73bf08e0383b16a19ecc232c2fbaab..126bd3d98e14e9ce6d618889ed61e2ab7410c100 100644
--- a/mojo/edk/embedder/platform_channel_pair.h
+++ b/mojo/embedder/platform_channel_pair.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
-#define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#ifndef MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#define MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/system/system_impl_export.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class CommandLine;
@@ -91,4 +91,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_