Rationalize mojo_public_*tests targets.

mojo/BUILD.gn

Index: mojo/BUILD.gn
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index 7028dfaded9058b020f554a92969571ebf6996b7..575910d787c3c4f591c358b988a4e6d267039ab7 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -95,69 +95,88 @@ static_library("system_thunks") {
 group("public_tests") {
   testonly = true
   deps = [
-    ":mojo_public_application_unittests",
-    ":mojo_public_bindings_perftests",
-    ":mojo_public_bindings_unittests",
+    # Unit tests:
     ":mojo_public_c_bindings_unittests",
-    ":mojo_public_environment_unittests",
-    ":mojo_public_system_perftests",
-    ":mojo_public_system_unittests",
-    ":mojo_public_utility_unittests",
+    ":mojo_public_c_system_unittests",
+    ":mojo_public_cpp_application_unittests",
+    ":mojo_public_cpp_bindings_unittests",
+    ":mojo_public_cpp_environment_unittests",
+    ":mojo_public_cpp_system_unittests",
+    ":mojo_public_cpp_utility_unittests",
+
+    # Perf tests:
+    ":mojo_public_c_system_perftests",
+    ":mojo_public_cpp_bindings_perftests",
   ]
 }
 
-test("mojo_public_application_unittests") {
+# C unit tests:
+
+test("mojo_public_c_bindings_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/application/tests",
+    "//mojo/public/c/bindings/tests",
   ]
 }
 
-test("mojo_public_bindings_unittests") {
+test("mojo_public_c_system_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/bindings/tests",
+    "//mojo/public/c/system/tests",
   ]
 }
 
-test("mojo_public_c_bindings_unittests") {
+# C++ unit tests:
+
+test("mojo_public_cpp_application_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/c/bindings/tests",
+    "//mojo/public/cpp/application/tests",
   ]
 }
 
-test("mojo_public_bindings_perftests") {
+test("mojo_public_cpp_bindings_unittests") {
   deps = [
-    "//mojo/edk/test:run_all_perftests",
-    "//mojo/public/cpp/bindings/tests:perftests",
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/bindings/tests",
   ]
 }
 
-test("mojo_public_environment_unittests") {
+test("mojo_public_cpp_environment_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
     "//mojo/public/cpp/environment/tests",
   ]
 }
 
-test("mojo_public_system_perftests") {
+test("mojo_public_cpp_system_unittests") {
   deps = [
-    "//mojo/edk/test:run_all_perftests",
-    "//mojo/public/c/system/tests:perftests",
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/system/tests",
   ]
 }
 
-test("mojo_public_system_unittests") {
+test("mojo_public_cpp_utility_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/system/tests",
+    "//mojo/public/cpp/utility/tests",
   ]
 }
 
-test("mojo_public_utility_unittests") {
+# C perf tests:
+
+test("mojo_public_c_system_perftests") {
   deps = [
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/utility/tests",
+    "//mojo/edk/test:run_all_perftests",
+    "//mojo/public/c/system/tests:perftests",
+  ]
+}
+
+# C++ perf tests:
+
+test("mojo_public_cpp_bindings_perftests") {
+  deps = [
+    "//mojo/edk/test:run_all_perftests",
+    "//mojo/public/cpp/bindings/tests:perftests",
   ]
 }