Re-enable dawn_perf_tests on mac high end perf bots

These tests were disabled because uploads were hanging. The tests
have now been switched to histograms and should no longer fail to
upload.

Bug: chromium:1035590
Change-Id: I16289ffff0ec7e2f1dcca95f9fcac014ef50531e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1988909
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728685}

testing/buildbot/chromium.perf.json

@@ -1789,6 +1789,44 @@
   },
   "mac-10_13_laptop_high_end-perf": {
     "isolated_scripts": [
+      {
+        "args": [
+          "--gtest-benchmark-name",
+          "dawn_perf_tests"
+        ],
+        "isolate_name": "dawn_perf_tests",
+        "merge": {
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "dawn_perf_tests",
+        "override_compile_targets": [
+          "dawn_perf_tests"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_APPLE SSD SM0512G"
+            }
+          ],
+          "expiration": 7200,
+          "hard_timeout": 19800,
+          "ignore_task_failure": false,
+          "io_timeout": 19800,
+          "shards": 1
+        },
+        "trigger_script": {
+          "args": [
+            "--multiple-dimension-script-verbose",
+            "True"
+          ],
+          "requires_simultaneous_shard_dispatch": true,
+          "script": "//testing/trigger_scripts/perf_device_trigger.py"
+        }
+      },
       {
         "args": [
           "-v",

tools/perf/core/perf_data_generator.py

@@ -759,6 +759,11 @@ BUILDERS = {
           '--assert-gpu-compositing',
         ],
       },
+      {
+        'isolate': 'dawn_perf_tests',
+        'num_shards': 1,
+        'type': TEST_TYPES.GTEST,
+      },
     ],
     'platform': 'mac',
     'dimension': {