Revert "Move mojo edk into mojo/edk"

mojo/embedder/platform_channel_pair.h

 // 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.
 
-#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;
 }
 
 namespace mojo {
 namespace embedder {
 
 // It would be nice to refactor base/process/launch.h to have a more platform-
 // independent way of representing handles that are passed to child processes.
@@ skipping 60 matching lines @@
 
   ScopedPlatformHandle server_handle_;
   ScopedPlatformHandle client_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformChannelPair);
 };
 
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
+#endif  // MOJO_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_