Revert "Move mojo edk into mojo/edk"

ipc/mojo/ipc_mojo_bootstrap.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 "ipc/mojo/ipc_mojo_bootstrap.h"
 
 #include "base/logging.h"
 #include "base/process/process_handle.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_platform_file.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 namespace IPC {
 
 namespace {
 
 // MojoBootstrap for the server process. You should create the instance
 // using MojoBootstrap::Create().
 class IPC_MOJO_EXPORT MojoServerBootstrap : public MojoBootstrap {
  public:
   MojoServerBootstrap();
@@ skipping 174 matching lines @@
 int MojoBootstrap::GetClientFileDescriptor() const {
   return channel_->GetClientFileDescriptor();
 }
 
 int MojoBootstrap::TakeClientFileDescriptor() {
   return channel_->TakeClientFileDescriptor();
 }
 #endif  // defined(OS_POSIX) && !defined(OS_NACL)
 
 }  // namespace IPC