Re-enable Webview GPU pixel tests on N5X

Re-enables the Android Webview GPU pixel tests on Nexus 5X devices since
the issue that was causing them to fail has been fixed.

TBR=ynovikov@chromium.org

Bug: 987623
Change-Id: Iae0a13488e023ac9969e462970441aa382bbd0c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728042Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682930}

testing/buildbot/chromium.gpu.fyi.json

@@ -4607,6 +4607,52 @@
       }
     ],
     "isolated_scripts": [
+      {
+        "args": [
+          "pixel",
+          "--show-stdout",
+          "--browser=android-webview-instrumentation",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--dont-restore-color-profile-after-test",
+          "--os-type",
+          "android",
+          "--build-revision",
+          "${got_revision}",
+          "--test-machine-name",
+          "${buildername}"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "android_webview_pixel_skia_gold_test",
+        "precommit_args": [
+          "--review-patch-issue",
+          "${patch_issue}",
+          "--review-patch-set",
+          "${patch_set}",
+          "--buildbucket-build-id",
+          "${buildbucket_build_id}"
+        ],
+        "should_retry_with_patch": false,
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_os_type": "userdebug",
+              "device_type": "bullhead",
+              "os": "Android"
+            }
+          ],
+          "idempotent": false,
+          "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
+        }
+      },
       {
         "args": [
           "--gtest-benchmark-name=angle_perftests",

testing/buildbot/test_suites.pyl

@@ -154,37 +154,35 @@
       },
     },
 
-    # Temporarily disabled due to timeouts causing invalid test results.
-    # TODO(jmadill): Re-enable once timeout is resolved. http://crbug.com/987623
-    # 'android_webview_gpu_telemetry_tests': {
-    #   'pixel_skia': {
-    #     'name': 'android_webview_pixel_skia_gold_test',
-    #     'args': [
-    #       '--dont-restore-color-profile-after-test',
-    #       '--os-type',
-    #       '${os_type}',
-    #       '--build-revision',
-    #       '${got_revision}',
-    #       '--test-machine-name',
-    #       '${buildername}',
-    #     ],
-    #     'precommit_args': [
-    #       # Gerrit issue ID
-    #       '--review-patch-issue',
-    #       '${patch_issue}',
-    #       # Patch set number
-    #       '--review-patch-set',
-    #       '${patch_set}',
-    #       # Buildbucket ID
-    #       '--buildbucket-build-id',
-    #       '${buildbucket_build_id}',
-    #     ],
-    #     'swarming': {
-    #       'service_account': 'chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com'
-    #     },
-    #     'telemetry_test_name': 'pixel',
-    #   },
-    # },
+    'android_webview_gpu_telemetry_tests': {
+      'pixel_skia': {
+        'name': 'android_webview_pixel_skia_gold_test',
+        'args': [
+          '--dont-restore-color-profile-after-test',
+          '--os-type',
+          '${os_type}',
+          '--build-revision',
+          '${got_revision}',
+          '--test-machine-name',
+          '${buildername}',
+        ],
+        'precommit_args': [
+          # Gerrit issue ID
+          '--review-patch-issue',
+          '${patch_issue}',
+          # Patch set number
+          '--review-patch-set',
+          '${patch_set}',
+          # Buildbucket ID
+          '--buildbucket-build-id',
+          '${buildbucket_build_id}',
+        ],
+        'swarming': {
+          'service_account': 'chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com'
+        },
+        'telemetry_test_name': 'pixel',
+      },
+    },
 
     'aura_gtests': {
       'aura_unittests': {},

testing/buildbot/waterfalls.pyl

@@ -2434,9 +2434,7 @@
           'gtest_tests': 'gpu_fyi_android_and_mac_gtests',
           'isolated_scripts': 'gpu_angle_and_mobile_representative_perf_fyi_isolated_scripts',
           'gpu_telemetry_tests': 'gpu_nexus5x_telemetry_tests',
-          # Temporarily disabled due to timeouts causing invalid test results.
-          # TODO(jmadill): Re-enable once timeout is resolved. http://crbug.com/987623
-          # 'android_webview_gpu_telemetry_tests': 'android_webview_gpu_telemetry_tests',
+          'android_webview_gpu_telemetry_tests': 'android_webview_gpu_telemetry_tests',
         },
       },
       'Android FYI Release (Nexus 6)': {