Revert "Move mojo edk into mojo/edk"

mojo/embedder/platform_channel_pair_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/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
 
 namespace {
 
 bool IsTargetDescriptorUsed(
     const base::FileHandleMappingVector& file_handle_mapping,
     int target_fd) {
   for (size_t i = 0; i < file_handle_mapping.size(); i++) {
@@ skipping 78 matching lines @@
       << kMojoPlatformChannelHandleSwitch << "="
       << command_line->GetSwitchValueASCII(kMojoPlatformChannelHandleSwitch);
   // (Any existing switch won't actually be removed from the command line, but
   // the last one appended takes precedence.)
   command_line->AppendSwitchASCII(kMojoPlatformChannelHandleSwitch,
                                   base::IntToString(target_fd));
 }
 
 }  // namespace embedder
 }  // namespace mojo