Rationalize mojo_public_*tests targets.

mojo/tools/data/unittests

Index: mojo/tools/data/unittests
diff --git a/mojo/tools/data/unittests b/mojo/tools/data/unittests
index 8400e8c4115932f2bf932b57638abef78107d034..e4c4390240334562127b73482746f8c927831407 100644
--- a/mojo/tools/data/unittests
+++ b/mojo/tools/data/unittests
@@ -27,20 +27,26 @@ tests = [
 
   # Public tests:
   {
-    "test": "mojo_public_bindings_unittests",
-    "cacheable": False,
+    "test": "mojo_public_c_bindings_unittests",
   },
   {
-    "test": "mojo_public_c_bindings_unittests",
+    "test": "mojo_public_c_system_unittests",
+  },
+  {
+    "test": "mojo_public_cpp_application_unittests",
+  },
+  {
+    "test": "mojo_public_cpp_bindings_unittests",
+    "cacheable": False,
   },
   {
-    "test": "mojo_public_environment_unittests",
+    "test": "mojo_public_cpp_environment_unittests",
   },
   {
-    "test": "mojo_public_system_unittests",
+    "test": "mojo_public_cpp_system_unittests",
   },
   {
-    "test": "mojo_public_utility_unittests",
+    "test": "mojo_public_cpp_utility_unittests",
   },
 
   # Non-system, non-public tests: