Revert "Move mojo edk into mojo/edk"

mojo/embedder/embedder.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_EMBEDDER_H_
-#define MOJO_EDK_EMBEDDER_EMBEDDER_H_
+#ifndef MOJO_EMBEDDER_EMBEDDER_H_
+#define MOJO_EMBEDDER_EMBEDDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner.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/public/cpp/system/core.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
 
 class PlatformSupport;
 
 // Must be called first to initialize the (global, singleton) system.
 MOJO_SYSTEM_IMPL_EXPORT void Init(scoped_ptr<PlatformSupport> platform_support);
 
 // A "channel" is a connection on top of an OS "pipe", on top of which Mojo
@@ skipping 90 matching lines @@
 // Retrieves the |PlatformHandle| that was wrapped into a |MojoHandle| (using
 // |CreatePlatformHandleWrapper()| above). Note that the |MojoHandle| must still
 // be closed separately.
 MOJO_SYSTEM_IMPL_EXPORT MojoResult
     PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle,
                               ScopedPlatformHandle* platform_handle);
 
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_EMBEDDER_H_
+#endif  // MOJO_EMBEDDER_EMBEDDER_H_