Revert "Move mojo edk into mojo/edk"

mojo/common/test/BUILD.gn

Index: mojo/common/test/BUILD.gn
diff --git a/mojo/common/test/BUILD.gn b/mojo/common/test/BUILD.gn
index ebad97e0b1038e89d0116614d9c5b1e0dd5f09f1..9be7ff11289b96c011b76d8502ffe45da381c9e1 100644
--- a/mojo/common/test/BUILD.gn
+++ b/mojo/common/test/BUILD.gn
@@ -9,8 +9,8 @@ source_set("run_all_unittests") {
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/c/test_support",
+    "//mojo/system",
     "//testing/gtest",
   ]
 
@@ -24,8 +24,8 @@ source_set("run_all_perftests") {
     ":test_support_impl",
     "//base",
     "//base/test:test_support",
-    "//mojo/edk/system",
     "//mojo/public/c/test_support",
+    "//mojo/system",
   ]
 
   sources = [ "run_all_perftests.cc" ]
@@ -44,3 +44,22 @@ source_set("test_support_impl") {
     "test_support_impl.h",
   ]
 }
+
+# GYP version: mojo/mojo_base.gyp:mojo_common_test_support
+source_set("test_support") {
+  testonly = true
+  deps = [
+    "//base",
+    "//base/test:test_support",
+    "//testing/gtest",
+    "//mojo/system",
+  ]
+
+  sources = [
+    "multiprocess_test_helper.cc",
+    "multiprocess_test_helper.h",
+    "test_utils.h",
+    "test_utils_posix.cc",
+    "test_utils_win.cc",
+  ]
+}