Revert "Move mojo edk into mojo/edk"

mojo/common/test/multiprocess_test_helper_unittest.cc

 // Copyright 2013 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/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/edk/test/test_utils.h"
+#include "mojo/common/test/test_utils.h"
+#include "mojo/embedder/scoped_platform_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
 namespace mojo {
 namespace test {
 namespace {
 
@@ skipping 127 matching lines @@
   EXPECT_FALSE(MultiprocessTestHelper::client_platform_handle.is_valid())
       << "DISREGARD: Expected failure #1 in child process";
   EXPECT_FALSE(IsNonBlocking(
       MultiprocessTestHelper::client_platform_handle.get()))
       << "DISREGARD: Expected failure #2 in child process";
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo