Add support for cc_perftests and other non-telemetry gtest based tests.

scripts/slave/recipes/chromium.expected/dynamic_script_test_with_args.json

Index: scripts/slave/recipes/chromium.expected/dynamic_script_test_with_args.json
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_gtest.json b/scripts/slave/recipes/chromium.expected/dynamic_script_test_with_args.json
similarity index 73%
copy from scripts/slave/recipes/chromium.expected/dynamic_gtest.json
copy to scripts/slave/recipes/chromium.expected/dynamic_script_test_with_args.json
index 6633f102842cb4702cc2605e88991a6f78c3b1a2..edfccca07132f8930cc4ef8421ac0c89e24016f1 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_gtest.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_script_test_with_args.json
@@ -98,12 +98,14 @@
       "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"Linux Tests\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"base_unittests\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"scripts\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"shard_index\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"browser_tests\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"total_shards\": 2@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"args\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"media_perftests\", @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"--single-process-tests\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        ], @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"name\": \"media_perftests\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"script\": \"gtest_perf_test.py\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -124,7 +126,7 @@
       "--paths",
       "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
       "--properties",
-      "{\"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"slavename\": \"TestSlavename\"}"
+      "{\"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
     ],
     "name": "get compile targets for scripts",
     "~followup_annotations": [
@@ -177,59 +179,29 @@
     "name": "extract build"
   },
   {
-    "allow_subannotations": true,
     "cmd": [
       "python",
       "-u",
-      "[BUILD]/scripts/slave/runtest.py",
-      "--target",
-      "Release",
-      "--xvfb",
-      "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--annotate=gtest",
-      "--test-type=base_unittests",
-      "--test-launcher-summary-output",
-      "/path/to/tmp/json",
-      "--generate-json-file",
-      "-o",
-      "gtest-results/base_unittests",
-      "--builder-name=Linux Tests",
-      "--slave-name=TestSlavename",
-      "--build-number=571",
-      "base_unittests"
-    ],
-    "name": "base_unittests"
-  },
-  {
-    "allow_subannotations": true,
-    "cmd": [
-      "python",
-      "-u",
-      "[BUILD]/scripts/slave/runtest.py",
-      "--target",
+      "[SLAVE_BUILD]/src/testing/scripts/gtest_perf_test.py",
+      "--build-config-fs",
       "Release",
-      "--xvfb",
-      "--factory-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"parent_buildername\": \"Linux Builder\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
-      "--annotate=gtest",
-      "--test-type=browser_tests",
-      "--test-launcher-summary-output",
-      "/path/to/tmp/json",
-      "--generate-json-file",
-      "-o",
-      "gtest-results/browser_tests",
-      "--builder-name=Linux Tests",
-      "--slave-name=TestSlavename",
-      "--build-number=571",
-      "browser_tests",
-      "--test-launcher-shard-index=0",
-      "--test-launcher-total-shards=2"
+      "--paths",
+      "{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
+      "--properties",
+      "{\"buildername\": \"Linux Tests\", \"buildnumber\": 571, \"mastername\": \"chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}",
+      "--args",
+      "[\"media_perftests\", \"--single-process-tests\"]",
+      "run",
+      "--output",
+      "/path/to/tmp/json"
     ],
-    "name": "browser_tests"
+    "name": "media_perftests",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"failures\": [], @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"valid\": true@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
   }
 ]