Revert "Move mojo edk into mojo/edk"

mojo/system/message_pipe_test_utils.h

Index: mojo/system/message_pipe_test_utils.h
diff --git a/mojo/edk/system/message_pipe_test_utils.h b/mojo/system/message_pipe_test_utils.h
similarity index 84%
rename from mojo/edk/system/message_pipe_test_utils.h
rename to mojo/system/message_pipe_test_utils.h
index 9e6a4b780e36f13f45eb47a35841b595e5661907..1d1f861b5e54b03666e80ba25c28d8efbdedba6b 100644
--- a/mojo/edk/system/message_pipe_test_utils.h
+++ b/mojo/system/message_pipe_test_utils.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
-#define MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#ifndef MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#define MOJO_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
 
 #include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/edk/system/channel.h"
-#include "mojo/edk/system/test_utils.h"
-#include "mojo/edk/test/multiprocess_test_helper.h"
+#include "mojo/common/test/multiprocess_test_helper.h"
+#include "mojo/embedder/simple_platform_support.h"
+#include "mojo/system/channel.h"
+#include "mojo/system/test_utils.h"
 
 namespace mojo {
 namespace system {
@@ -70,4 +70,4 @@ class MultiprocessMessagePipeTestBase : public testing::Test {
 }  // namespace system
 }  // namespace mojo
 
-#endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_TEST_UTILS_H_
+#endif  // MOJO_SYSTEM_MESSAGE_PIPE_TEST_HELPER_H_