Revert "Move mojo edk into mojo/edk"

mojo/embedder/platform_channel_pair_win.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 <windows.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
-#include "mojo/edk/embedder/platform_handle.h"
+#include "mojo/embedder/platform_handle.h"
 
 namespace mojo {
 namespace embedder {
 
 namespace {
 
 std::wstring GeneratePipeName() {
   return base::StringPrintf(L"\\\\.\\pipe\\mojo.%u.%u.%I64u",
                             GetCurrentProcessId(),
                             GetCurrentThreadId(),
@@ skipping 80 matching lines @@
       << 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(HandleToLong(client_handle_.get().handle)));
 }
 
 }  // namespace embedder
 }  // namespace mojo