Rationalize mojo_public_*tests targets.

mojo/tools/get_test_list.py

 #!/usr/bin/env python
 # 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.
 
 """Central list of tests to run (as appropriate for a given config). Add tests
 to run by modifying this file.
 
 Note that this file is both imported (by mojob.py) and run directly (via a
 recipe)."""
@@ skipping 197 matching lines @@
          "--package-root=" + os.path.join(build_dir,
                                           "gen",
                                           "dart-pkg",
                                           "packages")])
 
   # Perf tests -----------------------------------------------------------------
 
   bot_name = "linux_%s" % ("debug" if config.is_debug else "release")
 
   if target_os == Config.OS_LINUX and ShouldRunTest(Config.TEST_TYPE_PERF):
-    test_names = ["mojo_public_system_perftests",
-                  "mojo_public_bindings_perftests",
+    test_names = ["mojo_public_c_system_perftests",
+                  "mojo_public_cpp_bindings_perftests",
                   "mojo_edk_system_perftests"]
 
     for test_name in test_names:
       command = ["python",
                  os.path.join("mojo", "tools", "perf_test_runner.py"),
                  "--upload",
                  "--server-url", _PERFORMANCE_DASHBOARD_URL,
                  "--bot-name", bot_name,
                  "--test-name", test_name,
                  "--perf-data-path",
@@ skipping 65 matching lines @@
   config = Config(**json.load(args.config_file))
   test_list = GetTestList(config)
   json.dump(test_list, args.test_list_file, indent=2)
   args.test_list_file.write("\n")
 
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())