Revert "Move mojo edk into mojo/edk"

mojo/shell/incoming_connection_listener_unittest.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 "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/edk/embedder/channel_init.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/channel_init.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/external_application_registrar_connection.h"
 #include "mojo/shell/incoming_connection_listener_posix.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/socket_descriptor.h"
 #include "net/socket/unix_domain_client_socket_posix.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
@@ skipping 118 matching lines @@
 
   ListeningFailsDelegate fail_delegate(net::ERR_FILE_NOT_FOUND);
   IncomingConnectionListenerPosix listener(nonexistent_dir, &fail_delegate);
 
   // The listener should fail to start up.
   listener.StartListening();
 }
 
 }  // namespace shell
 }  // namespace mojo