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

mojo/edk/test/BUILD.gn

 # 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.
 
 import("../mojo_edk.gni")
 
 # GYP version: mojo/edk/mojo_edk.gyp:mojo_common_test_support
 mojo_edk_source_set("test_support") {
   testonly = true
   sources = [
@@ skipping 62 matching lines @@
 
   sources = [
     "test_support_impl.cc",
     "test_support_impl.h",
   ]
 }
 
 # 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",
     "../../public/cpp/application/tests",
   ]
 }
 
-# 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",
     "../../public/cpp/bindings/tests",
   ]
 }
 
-# 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",
     "../../public/cpp/environment/tests",
   ]
 }
 
-# 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",
+  ]
+}