Rationalize mojo_public_*tests targets.

mojo/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("//build/config/nacl/config.gni")
 import("//build/module_args/mojo.gni")
 import("//mojo/public/mojo.gni")
 import("//testing/test.gni")
 
 declare_args() {
@@ skipping 77 matching lines @@
 }
 
 # Public SDK test targets follow. These targets are not defined within the
 # public SDK itself since they are built as native executable binaries, needing
 # to be linked with the EDK.
 # TODO(vtl): They should be converted to "apptests", i.e., run as apps.
 
 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") {
-  deps = [
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/application/tests",
-  ]
-}
-
-test("mojo_public_bindings_unittests") {
-  deps = [
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/bindings/tests",
-  ]
-}
+# C unit tests:
 
 test("mojo_public_c_bindings_unittests") {
   deps = [
     "//mojo/edk/test:run_all_unittests",
     "//mojo/public/c/bindings/tests",
   ]
 }
 
-test("mojo_public_bindings_perftests") {
+test("mojo_public_c_system_unittests") {
   deps = [
-    "//mojo/edk/test:run_all_perftests",
-    "//mojo/public/cpp/bindings/tests:perftests",
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/c/system/tests",
   ]
 }
 
-test("mojo_public_environment_unittests") {
+# C++ unit tests:
+
+test("mojo_public_cpp_application_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/application/tests",
+  ]
+}
+
+test("mojo_public_cpp_bindings_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/bindings/tests",
+  ]
+}
+
+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_unittests",
+    "//mojo/public/cpp/system/tests",
+  ]
+}
+
+test("mojo_public_cpp_utility_unittests") {
+  deps = [
+    "//mojo/edk/test:run_all_unittests",
+    "//mojo/public/cpp/utility/tests",
+  ]
+}
+
+# C perf tests:
+
+test("mojo_public_c_system_perftests") {
   deps = [
     "//mojo/edk/test:run_all_perftests",
     "//mojo/public/c/system/tests:perftests",
   ]
 }
 
-test("mojo_public_system_unittests") {
+# C++ perf tests:
+
+test("mojo_public_cpp_bindings_perftests") {
   deps = [
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/system/tests",
+    "//mojo/edk/test:run_all_perftests",
+    "//mojo/public/cpp/bindings/tests:perftests",
   ]
 }
-
-test("mojo_public_utility_unittests") {
-  deps = [
-    "//mojo/edk/test:run_all_unittests",
-    "//mojo/public/cpp/utility/tests",
-  ]
-}