Revert "Move mojo edk into mojo/edk"

mojo/shell/child_process.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/child_process.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
-#include "mojo/edk/embedder/platform_channel_pair.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/app_child_process.h"
 #include "mojo/shell/switches.h"
 #include "mojo/shell/test_child_process.h"
 
 namespace mojo {
 namespace shell {
 
 ChildProcess::~ChildProcess() {
 }
 
@@ skipping 28 matching lines @@
   }
 
   return rv.Pass();
 }
 
 ChildProcess::ChildProcess() {
 }
 
 }  // namespace shell
 }  // namespace mojo