Revert "Move mojo edk into mojo/edk"

mojo/shell/app_child_process_host.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/shell/app_child_process_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/edk/embedder/embedder.h"
+#include "mojo/embedder/embedder.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/task_runners.h"
 
 namespace mojo {
 namespace shell {
 
 AppChildProcessHost::AppChildProcessHost(
     Context* context,
     AppChildControllerClient* controller_client)
@@ skipping 33 matching lines @@
 void AppChildProcessHost::DidCreateChannel(
     embedder::ChannelInfo* channel_info) {
   DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
 
   CHECK(channel_info);
   channel_info_ = channel_info;
 }
 
 }  // namespace shell
 }  // namespace mojo