Migrate CQ gtest_perf_tests to run_performance_tests.py.

components_perftests and views_perftests run on the CQ
and use run_performance_tests_wrapper.py. This changelist
migrates them to use run_performance_tests.py. This migration
unblocks deleting run_gtest_perf_test.py (and then all the
perf tests use run_performance_tests.py as their runner,
which then allows us to finally delete
run_performance_tests_wrapper.py.)

Note that I also needed to add a slash at the end of
a target for components/BUILD.gn since I was getting the
error
"Input directory [...]src/components/subresource_filter/
core/common/perftests/data must have a trailing slash
"

CC=​​​​​​tapted@chromium.org
R=johnchen@chromium.org,eyaich@chromium.org
TBR=blundell@chromium.org

Bug: 924351
Change-Id: I9f4542c22b72d45176574d379ed4eaedf6eb8e92
Reviewed-on: https://chromium-review.googlesource.com/c/1428090
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625429}

components/BUILD.gn

@@ -616,7 +616,7 @@ if (!is_ios) {
     data = [
       "$root_out_dir/components_tests_resources.pak",
       "$root_out_dir/ui_test.pak",
-      "//components/subresource_filter/core/common/perftests/data",
+      "//components/subresource_filter/core/common/perftests/data/",
     ]
 
     if (is_android) {

testing/buildbot/chromium.android.json

@@ -23694,7 +23694,13 @@
     ],
     "isolated_scripts": [
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.clang.json

@@ -13696,7 +13696,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -13749,6 +13755,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.fyi.json

@@ -891,7 +891,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -944,6 +950,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -6576,6 +6588,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -10721,6 +10739,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -12129,7 +12153,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -12224,6 +12254,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.linux.json

@@ -1676,6 +1676,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -2386,6 +2392,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -3052,6 +3064,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4302,6 +4320,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.mac.json

@@ -995,7 +995,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -1087,6 +1093,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2121,7 +2133,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -2213,6 +2231,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -3330,7 +3354,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -3422,6 +3452,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -4456,7 +4492,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -4529,6 +4571,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -5632,6 +5680,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.win.json

@@ -716,7 +716,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -781,6 +787,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -3371,6 +3383,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -4098,7 +4116,13 @@
         }
       },
       {
+        "args": [
+          "--smoke-test-mode"
+        ],
         "isolate_name": "components_perftests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "components_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4163,6 +4187,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4943,6 +4973,12 @@
       },
       {
         "isolate_name": "views_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
         "name": "views_perftests",
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/gn_isolate_map.pyl

@@ -649,6 +649,9 @@
   "components_perftests": {
     "args": [
       "--xvfb",
+      "--benchmark=components_perftests",
+      "--non-telemetry=true",
+      "--migrated-test=true",
       "components_perftests",
     ],
     "label": "//components:components_perftests",
@@ -2575,6 +2578,9 @@
   "views_perftests": {
     "args": [
       "--xvfb",
+      "--benchmark=views_perftests",
+      "--non-telemetry=true",
+      "--migrated-test=true",
       "views_perftests",
     ],
     "label": "//ui/views:views_perftests",

testing/buildbot/test_suites.pyl

@@ -2650,7 +2650,14 @@
     },
 
     'components_perftests_isolated_scripts' : {
-      'components_perftests': {},
+      'components_perftests': {
+        'merge': {
+          'script': '//tools/perf/process_perf_results.py',
+        },
+        'args': [
+          '--smoke-test-mode',
+        ],
+      },
     },
 
     'cronet_gtests': {
@@ -2693,7 +2700,14 @@
           'shards': 4,
         },
       },
-      'views_perftests': {},
+      'views_perftests': {
+        'merge': {
+          'script': '//tools/perf/process_perf_results.py',
+          'args': [
+            '--smoke-test-mode',
+          ],
+        },
+      },
       'webkit_layout_tests': {
         # layout test failures are retried 3 times when '--test-list' is not
         # passed, but 0 times when '--test-list' is passed. We want to always