Move remaining test targets out of //mojo/public.

mojo/edk/test/BUILD.gn

Index: mojo/edk/test/BUILD.gn
diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn
index 8d032ad86a30111392d03aa00a972f16dbb09fb0..5a10d7d51b51b6be0c59706e5d7010e81dd170c6 100644
--- a/mojo/edk/test/BUILD.gn
+++ b/mojo/edk/test/BUILD.gn
@@ -80,7 +80,7 @@ mojo_edk_source_set("test_support_impl") {
 # Public SDK test targets follow. These targets are not defined within the
 # public SDK itself as running the unittests requires the EDK.
 
-# GYP version: mojo/mojo_base.gyp:mojo_public_application_unittests
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_application_unittests
 test("mojo_public_application_unittests") {
   deps = [
     ":run_all_unittests",
@@ -88,7 +88,7 @@ test("mojo_public_application_unittests") {
   ]
 }
 
-# GYP version: mojo/mojo_base.gyp:mojo_public_bindings_unittests
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests
 test("mojo_public_bindings_unittests") {
   deps = [
     ":run_all_unittests",
@@ -96,7 +96,7 @@ test("mojo_public_bindings_unittests") {
   ]
 }
 
-# GYP version: mojo/mojo_base.gyp:mojo_public_environment_unittests
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests
 test("mojo_public_environment_unittests") {
   deps = [
     ":run_all_unittests",
@@ -104,10 +104,26 @@ test("mojo_public_environment_unittests") {
   ]
 }
 
-# GYP version: mojo/mojo_base.gyp:mojo_public_system_perftests
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests
 test("mojo_public_system_perftests") {
   deps = [
     ":run_all_perftests",
     "../../public/c/system/tests:perftests",
   ]
 }
+
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests
+test("mojo_public_system_unittests") {
+  deps = [
+    ":run_all_unittests",
+    "../../public/cpp/system/tests",
+  ]
+}
+
+# GYP version: mojo/edk/mojo_edk_tests.gyp:mojo_public_utility_unittests
+test("mojo_public_utility_unittests") {
+  deps = [
+    ":run_all_unittests",
+    "../../public/cpp/utility/tests",
+  ]
+}