Migrating remaining chromium_test references to one buildbot step.

This enables deletion of the telemetry_perf_tests isolate and the recipe
code that supports it.

Bug: 757933
Change-Id: I82198ff98e3d7dc189761f1468bc88b591f2a5b1
Reviewed-on: https://chromium-review.googlesource.com/1129364Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Emily Hanley <eyaich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#573456}

BUILD.gn

@@ -1057,7 +1057,6 @@ group("chromium_builder_perf") {
       "//cc:cc_perftests",
       "//chrome/test:load_library_perf_tests",
       "//chrome/test:performance_test_suite",
-      "//chrome/test:telemetry_perf_tests",
       "//chrome/test:telemetry_perf_tests_without_chrome",
       "//components/tracing:tracing_perftests",
       "//gpu:command_buffer_perftests",

testing/buildbot/chromium.android.fyi.json

@@ -599,61 +599,20 @@
     "isolated_scripts": [
       {
         "args": [
-          "heap_profiling.mobile.disabled",
+          "--smoke-test-mode",
+          "--benchmarks=heap_profiling.mobile.disabled,heap_profiling.mobile.native,heap_profiling.mobile.pseudo",
           "-v",
           "--output-format=chartjson",
           "--browser=android-chromium"
         ],
-        "isolate_name": "telemetry_perf_tests",
-        "name": "heap_profiling.mobile.disabled",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "KTU84P",
-              "device_type": "hammerhead",
-              "os": "Android"
-            }
-          ],
-          "expiration": 36000,
-          "hard_timeout": 10800,
-          "ignore_task_failure": false,
-          "io_timeout": 3600
-        }
-      },
-      {
-        "args": [
-          "heap_profiling.mobile.native",
-          "-v",
-          "--output-format=chartjson",
-          "--browser=android-chromium"
-        ],
-        "isolate_name": "telemetry_perf_tests",
-        "name": "heap_profiling.mobile.native",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "KTU84P",
-              "device_type": "hammerhead",
-              "os": "Android"
-            }
+        "isolate_name": "performance_test_suite",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
           ],
-          "expiration": 36000,
-          "hard_timeout": 10800,
-          "ignore_task_failure": false,
-          "io_timeout": 3600
-        }
-      },
-      {
-        "args": [
-          "heap_profiling.mobile.pseudo",
-          "-v",
-          "--output-format=chartjson",
-          "--browser=android-chromium"
-        ],
-        "isolate_name": "telemetry_perf_tests",
-        "name": "heap_profiling.mobile.pseudo",
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "heap_profiling.mobile",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [

testing/buildbot/chromium.linux.json

@@ -741,16 +741,23 @@
     "isolated_scripts": [
       {
         "args": [
-          "memory.leak_detection",
+          "--benchmarks=memory.leak_detection",
+          "--smoke-test-mode",
           "--upload-results",
           "--output-format=histograms",
           "--browser=release",
           "--xvfb"
         ],
-        "isolate_name": "telemetry_perf_tests",
+        "isolate_name": "performance_test_suite",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "memory.leak_detection",
         "override_compile_targets": [
-          "telemetry_perf_tests"
+          "performance_test_suite"
         ],
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/gn_isolate_map.pyl

@@ -1088,14 +1088,9 @@
       "-v",
     ],
   },
-  "telemetry_perf_tests": {
-    "label": "//chrome/test:telemetry_perf_tests",
-    "type": "script",
-    "script": "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
-    "args": [
-      "../../tools/perf/run_benchmark",
-    ],
-  },
+  # This isolate is solely used to run the One Builbot Step Tester
+  # trybot so that we don't use the full chrome build each time.  Instead
+  # this uses the reference build to run telemetry.
   "telemetry_perf_tests_without_chrome": {
     "label": "//chrome/test:telemetry_perf_tests_without_chrome",
     "type": "script",
@@ -1104,9 +1099,6 @@
       "../../tools/perf/run_benchmark",
     ],
   },
-  # Perf is in the middle of refactoring their recipe.  crbug.com/757933
-  # These isolates are the new targets for the refactor and will replace
-  # the old ones when migration is complete.
   "performance_test_suite": {
     "label": "//chrome/test:performance_test_suite",
     "type": "script",

testing/buildbot/test_suites.pyl

@@ -1596,16 +1596,23 @@
   'leak_detection_isolated_scripts': {
     'memory.leak_detection': {
       'args': [
-        'memory.leak_detection',
+        '--benchmarks=memory.leak_detection',
+        '--smoke-test-mode',
         '--upload-results',
         '--output-format=histograms',
         '--browser=release',
         '--xvfb'
       ],
-      'isolate_name': 'telemetry_perf_tests',
+      'isolate_name': 'performance_test_suite',
       'override_compile_targets': [
-        'telemetry_perf_tests',
+        'performance_test_suite',
       ],
+      'merge': {
+        'args': [
+          '--smoke-test-mode',
+        ],
+        'script': '//tools/perf/process_perf_results.py',
+      },
       'swarming': {
         'expiration': 36000,
         'hard_timeout': 10800,
@@ -1692,32 +1699,21 @@
   },
 
   'memory_infra_isolated_scripts': {
-    'heap_profiling.mobile.disabled': {
-      'args': [
-        'heap_profiling.mobile.disabled',
-        '-v',
-        '--output-format=chartjson',
-        '--browser=android-chromium',
-      ],
-      'isolate_name': 'telemetry_perf_tests',
-    },
-    'heap_profiling.mobile.native': {
+    'heap_profiling.mobile': {
       'args': [
-        'heap_profiling.mobile.native',
-        '-v',
-        '--output-format=chartjson',
-        '--browser=android-chromium',
-      ],
-      'isolate_name': 'telemetry_perf_tests',
-    },
-    'heap_profiling.mobile.pseudo': {
-      'args': [
-        'heap_profiling.mobile.pseudo',
+        '--smoke-test-mode',
+        '--benchmarks=heap_profiling.mobile.disabled,heap_profiling.mobile.native,heap_profiling.mobile.pseudo',
         '-v',
         '--output-format=chartjson',
         '--browser=android-chromium',
       ],
-      'isolate_name': 'telemetry_perf_tests',
+      'isolate_name': 'performance_test_suite',
+      'merge': {
+        'args': [
+          '--smoke-test-mode',
+        ],
+        'script': '//tools/perf/process_perf_results.py',
+      },
     },
   },