Re-enable performance_browser_tests on all platforms.

Fixes were made to restore the functioning of the tests in commit
c9cee7e5.

Bug: 789192
Change-Id: I3ec2b8a2dd3a04f24dbcc3998ca3f7f138cc281f
Reviewed-on: https://chromium-review.googlesource.com/c/1334852Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#607898}

testing/buildbot/chromium.perf.json

@@ -467,6 +467,45 @@
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
       },
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "performance_browser_tests",
+          "--non-telemetry=true",
+          "--migrated-test=true"
+        ],
+        "isolate_name": "performance_browser_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_browser_tests",
+        "override_compile_targets": [
+          "performance_browser_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:1cb3",
+              "os": "Windows-2008ServerR2-SP1",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 25200,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 1,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "--gtest-benchmark-name",
@@ -670,6 +709,45 @@
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
       },
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "performance_browser_tests",
+          "--non-telemetry=true",
+          "--migrated-test=true"
+        ],
+        "isolate_name": "performance_browser_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_browser_tests",
+        "override_compile_targets": [
+          "performance_browser_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "102b:0532",
+              "os": "Windows-2008ServerR2-SP1",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 25200,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 1,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "-v",
@@ -1229,6 +1307,45 @@
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
       },
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "performance_browser_tests",
+          "--non-telemetry=true",
+          "--migrated-test=true"
+        ],
+        "isolate_name": "performance_browser_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_browser_tests",
+        "override_compile_targets": [
+          "performance_browser_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "10de:1cb3",
+              "os": "Ubuntu-14.04",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 25200,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 1,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "--gtest-benchmark-name",
@@ -1553,6 +1670,45 @@
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
       },
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "performance_browser_tests",
+          "--non-telemetry=true",
+          "--migrated-test=true"
+        ],
+        "isolate_name": "performance_browser_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_browser_tests",
+        "override_compile_targets": [
+          "performance_browser_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "1002:6821",
+              "os": "Mac-10.13",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 25200,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 1,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "--gtest-benchmark-name",
@@ -1759,6 +1915,45 @@
           "script": "//testing/trigger_scripts/perf_device_trigger.py"
         }
       },
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "performance_browser_tests",
+          "--non-telemetry=true",
+          "--migrated-test=true"
+        ],
+        "isolate_name": "performance_browser_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "performance_browser_tests",
+        "override_compile_targets": [
+          "performance_browser_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "8086:5912",
+              "os": "Windows-10",
+              "pool": "chrome.tests.perf"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 25200,
+          "ignore_task_failure": false,
+          "io_timeout": 1800,
+          "shards": 1,
+          "upload_test_results": true
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "--gtest-benchmark-name",

tools/perf/core/perf_data_generator.py

@@ -8,7 +8,7 @@
 """Script to generate chromium.perf.json in
 the src/testing/buildbot directory and benchmark.csv in the src/tools/perf
 directory. Maintaining these files by hand is too unwieldy.
-Note: chromium.perf.fyi.json is updated manuall for now until crbug.com/757933
+Note: chromium.perf.fyi.json is updated manually for now until crbug.com/757933
 is complete.
 """
 import argparse
@@ -307,6 +307,11 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
               '--assert-gpu-compositing',
           ],
         },
+        {
+          'isolate': 'performance_browser_tests',
+          'num_shards': 1,
+          'telemetry': False,
+        },
         {
           'isolate': 'media_perftests',
           'num_shards': 1,
@@ -346,7 +351,11 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
               '--test-shard-map-filename=win_7_perf_map.json',
           ],
         },
-        # crbug.com/735679 enable performance_browser_tests
+        {
+          'isolate': 'performance_browser_tests',
+          'num_shards': 1,
+          'telemetry': False,
+        },
         {
           'isolate': 'load_library_perf_tests',
           'num_shards': 1,
@@ -382,7 +391,11 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
               '--assert-gpu-compositing',
           ],
         },
-        # crbug.com/735679 enable performance_browser_tests
+        {
+          'isolate': 'performance_browser_tests',
+          'num_shards': 1,
+          'telemetry': False,
+        },
         {
           'isolate': 'load_library_perf_tests',
           'num_shards': 1,
@@ -440,12 +453,12 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           ],
         },
         {
-          'isolate': 'load_library_perf_tests',
+          'isolate': 'performance_browser_tests',
           'num_shards': 1,
           'telemetry': False,
         },
         {
-          'isolate': 'performance_browser_tests',
+          'isolate': 'load_library_perf_tests',
           'num_shards': 1,
           'telemetry': False,
         }
@@ -469,6 +482,11 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
               '--assert-gpu-compositing',
           ],
         },
+        {
+          'isolate': 'performance_browser_tests',
+          'num_shards': 1,
+          'telemetry': False,
+        },
         {
           'isolate': 'load_library_perf_tests',
           'num_shards': 1,
@@ -513,6 +531,11 @@ NEW_PERF_RECIPE_MIGRATED_TESTERS = {
           ],
           'num_shards': 26
         },
+        {
+          'isolate': 'performance_browser_tests',
+          'num_shards': 1,
+          'telemetry': False,
+        },
         {
           'isolate': 'net_perftests',
           'num_shards': 1,