Revert "Move mojo edk into mojo/edk"

mojo/embedder/channel_init.cc

 // 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.
 
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 
 namespace mojo {
 namespace embedder {
 
 ChannelInit::ChannelInit() : channel_info_(nullptr), weak_factory_(this) {
 }
 
 ChannelInit::~ChannelInit() {
   if (channel_info_)
     DestroyChannel(channel_info_);
@@ skipping 27 matching lines @@
   if (!self) {
     DestroyChannel(channel);
     return;
   }
 
   self->channel_info_ = channel;
 }
 
 }  // namespace embedder
 }  // namespace mojo