Revert "Move mojo edk into mojo/edk"

mojo/embedder/channel_init.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_CHANNEL_INIT_H_
-#define MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#ifndef MOJO_EMBEDDER_CHANNEL_INIT_H_
+#define MOJO_EMBEDDER_CHANNEL_INIT_H_
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/system/system_impl_export.h"
 
 namespace base {
 class MessageLoopProxy;
 class TaskRunner;
 }
 
 namespace mojo {
 namespace embedder {
 struct ChannelInfo;
 }
@@ skipping 30 matching lines @@
   ChannelInfo* channel_info_;
 
   base::WeakPtrFactory<ChannelInit> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChannelInit);
 };
 
 }  // namespace embedder
 }  // namespace mojo
 
-#endif  // MOJO_EDK_EMBEDDER_CHANNEL_INIT_H_
+#endif  // MOJO_EMBEDDER_CHANNEL_INIT_H_