Revert "Move mojo edk into mojo/edk"

mojo/shell/external_application_listener_posix.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/external_application_listener_posix.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_checker.h"
 #include "base/tracked_objects.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/edk/embedder/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/shell/external_application_registrar.mojom.h"
 #include "mojo/shell/incoming_connection_listener_posix.h"
 #include "net/base/net_errors.h"
 #include "net/socket/socket_descriptor.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
@@ skipping 162 matching lines @@
 void ExternalApplicationListenerPosix::RegistrarImpl::Register(
     const String& app_url,
     InterfaceRequest<Shell> shell,
     const mojo::Closure& callback) {
   register_callback_.Run(app_url.To<GURL>(), shell.PassMessagePipe());
   callback.Run();
 }
 
 }  // namespace shell
 }  // namespace mojo