enable weblayer_shell_wpt tests on webview fyi bots.

Bug: 1019521
Change-Id: Idfc304e1f335a4d03d4cccdc9101584564236c53
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980997Reviewed-by: Clark DuVall <cduvall@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Andrew Luo <aluo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730054}

testing/buildbot/chromium.android.fyi.json

@@ -369,6 +369,40 @@
           "shards": 15
         },
         "test_target": "//android_webview/test:system_webview_wpt"
+      },
+      {
+        "args": [
+          "--disable-features=OutOfBlinkCors"
+        ],
+        "isolate_name": "weblayer_shell_wpt",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "weblayer_shell_wpt",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "tLMjWvOcbQX4nMo5WnMsKWn0aaVludzuSX9yiVFUCoUC"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "expiration": 18000,
+          "hard_timeout": 14400,
+          "shards": 15
+        },
+        "test_target": "//weblayer/shell/android:weblayer_shell_wpt"
       }
     ]
   },
@@ -486,6 +520,37 @@
           "shards": 15
         },
         "test_target": "//android_webview/test:system_webview_wpt"
+      },
+      {
+        "isolate_name": "weblayer_shell_wpt",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "weblayer_shell_wpt",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "chromium/chrome/test/chromedriver/cipd",
+              "location": "chrome/test/chromedriver/cipd",
+              "revision": "tLMjWvOcbQX4nMo5WnMsKWn0aaVludzuSX9yiVFUCoUC"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "PQ3A.190801.002",
+              "device_os_flavor": "google",
+              "device_os_type": "userdebug",
+              "device_type": "walleye",
+              "os": "Android"
+            }
+          ],
+          "expiration": 18000,
+          "hard_timeout": 14400,
+          "shards": 15
+        },
+        "test_target": "//weblayer/shell/android:weblayer_shell_wpt"
       }
     ]
   },

testing/buildbot/gn_isolate_map.pyl

@@ -482,7 +482,7 @@
     "args": [
       "--product=chrome_android",
       "--apk=apks/ChromePublic.apk",
-      "-vvvv",
+      "-vvv",
     ],
   },
   "chrome_sandbox": {
@@ -1554,7 +1554,7 @@
       "--product=android_webview",
       "--apk=apks/SystemWebView.apk",
       "--system-webview-shell=apks/SystemWebViewShell.apk",
-      "-vvvv",
+      "-vvv",
     ],
   },
   "telemetry_gpu_integration_test": {
@@ -1770,6 +1770,17 @@
     "label": "//weblayer/test:weblayer_browsertests",
     "type": "windowed_test_launcher",
   },
+  "weblayer_shell_wpt": {
+    "label": "//weblayer/shell/android:weblayer_shell_wpt",
+    "type": "script",
+    "script": "//testing/scripts/run_android_wpt.py",
+    "args": [
+      "--product=android_weblayer",
+      "--weblayer-shell=apks/WebLayerShell.apk",
+      "--weblayer-support=apks/WebLayerSupport.apk",
+      "-vvv",
+    ],
+  },
   "webview_cts_tests": {
     "args": [
       "--logdog-bin-cmd",

testing/buildbot/test_suites.pyl

@@ -3250,6 +3250,23 @@
       },
     },
 
+    'weblayer_shell_wpt': {
+      'weblayer_shell_wpt': {
+        'swarming': {
+          'shards': 15,
+          'expiration': 18000,
+          'hard_timeout': 14400,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/chrome/test/chromedriver/cipd',
+              'location': 'chrome/test/chromedriver/cipd',
+              'revision': 'tLMjWvOcbQX4nMo5WnMsKWn0aaVludzuSX9yiVFUCoUC',
+            }
+          ]
+        },
+      },
+    },
+
     # TODO(crbug.com/888429): Port remaining WebRTC tests to swarming.
     'webrtc_chromium_baremetal_gtests': {
       # Run capture unittests as well since our bots have real webcams.
@@ -3565,6 +3582,7 @@
     'android_wpt_scripts': [
       'chrome_public_wpt',
       'system_webview_wpt',
+      'weblayer_shell_wpt',
     ],
 
     'bfcache_android_gtests': [

testing/scripts/run_android_wpt.py

@@ -65,6 +65,10 @@ WEBLAYER_SUPPORT_PKG = 'org.chromium.weblayer.support'
 HOST_RESOLVER_ARGS = ['--host-resolver-rules=MAP nonexistent.*.test ~NOTFOUND,'
                       ' MAP *.test 127.0.0.1']
 
+# WebLayer has popup protection enabled by default that prevents
+# chromedriver from opening test windows.
+DISABLE_POPUP_ARGS = ['--disable-popup-blocking']
+
 # Browsers on debug and eng devices read command-line-flags from special files
 # during startup.
 FLAGS_FILE_MAP = {'android_weblayer': 'weblayer-command-line',
@@ -342,6 +346,8 @@ def main():
 
   flags_file = FLAGS_FILE_MAP[adapter.options.product]
   all_flags = HOST_RESOLVER_ARGS + adapter.pass_through_binary_args
+  if adapter.options.product == 'android_weblayer':
+    all_flags += DISABLE_POPUP_ARGS
   logger.info('Setting flags in ' + flags_file + ' to: ' + str(all_flags))
   flags = flag_changer.CustomCommandLineFlags(device, flags_file, all_flags)
 

weblayer/shell/android/BUILD.gn

@@ -194,3 +194,15 @@ android_apk("weblayer_support_apk") {
 
   shared_libraries = [ "//weblayer:libweblayer" ]
 }
+group("weblayer_shell_wpt") {
+  testonly = true
+  data_deps = [
+    ":weblayer_shell_apk",
+    ":weblayer_support_apk",
+    "//build/android:test_runner_py",
+  ]
+  set_sources_assignment_filter([ "#*" ])
+  sources = read_file("//testing/scripts/run_android_wpt.pydeps", "list lines")
+  data = sources
+  data += [ "//third_party/blink/web_tests/external/" ]
+}