Run tests on the WebView bots with and without field trials.

Change-Id: I49e7cab2a169292d3650aea164da068ce69871d0
Bug: 997309
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763263
Commit-Queue: Andrew Luo <aluo@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690422}

build/android/pylib/constants/__init__.py

@@ -71,6 +71,14 @@ PACKAGE_INFO.update({
     chrome.PackageInfo('com.google.android.webview',
                        'com.android.cts.webkit.WebViewStartupCtsActivity',
                        'webview-command-line', None),
+    'android_system_webview_shell':
+    chrome.PackageInfo('org.chromium.webview_shell',
+                       'org.chromium.webview_shell.WebViewBrowserActivity',
+                       'webview-command-line', None),
+    'android_webview_ui_test':
+    chrome.PackageInfo('org.chromium.webview_ui_test',
+                       'org.chromium.webview_ui_test.WebViewUiTestActivity',
+                       'webview-command-line', None),
 })
 
 

testing/buildbot/gn_isolate_map.pyl

@@ -2547,6 +2547,7 @@
       "apks/SystemWebView.apk",
       "--replace-system-package",
       "org.chromium.webview_shell,apks/SystemWebViewShell.apk",
+      "--use-apk-under-test-flags-file",
     ],
     "label": "//android_webview/tools/system_webview_shell:system_webview_shell_layout_test_apk",
     "type": "console_test_launcher",
@@ -2967,6 +2968,7 @@
     "args": [
       "--use-webview-provider",
       "apks/SystemWebView.apk",
+      "--use-apk-under-test-flags-file",
     ],
     "label": "//android_webview/tools/automated_ui_tests:webview_ui_test_app_test_apk",
     "type": "console_test_launcher",

testing/buildbot/test_suites.pyl

@@ -4621,6 +4621,15 @@
       'system_webview_shell_layout_test_apk': {},
     },
 
+    'system_webview_shell_instrumentation_tests_no_field_trial': {
+      'system_webview_shell_layout_test_apk_no_field_trial': {
+        'args': [
+          '--disable-field-trial-config',
+        ],
+        'test': 'system_webview_shell_layout_test_apk',
+      },
+    },
+
     'telemetry_perf_unittests_isolated_scripts': {
       'telemetry_perf_unittests': {
         'swarming': {
@@ -4768,10 +4777,38 @@
       },
     },
 
+    'webview_cts_tests_gtest_no_field_trial': {
+      'webview_cts_tests_no_field_trial': {
+        'args': [
+          '--disable-field-trial-config',
+        ],
+        'swarming': {
+          'shards': 3,
+          'cipd_packages': [
+            {
+              "cipd_package": 'chromium/android_webview/tools/cts_archive',
+              'location': 'android_webview/tools/cts_archive',
+              'revision': 'version:1.7',
+            }
+          ]
+        },
+        'test': 'webview_cts_tests',
+      },
+    },
+
     'webview_ui_instrumentation_tests': {
       'webview_ui_test_app_test_apk': {},
     },
 
+    'webview_ui_instrumentation_tests_no_field_trial': {
+      'webview_ui_test_app_test_apk_no_field_trial': {
+        'args': [
+          '--disable-field-trial-config',
+        ],
+        'test': 'webview_ui_test_app_test_apk',
+      },
+    },
+
     'win7_32_bit_gtests': {
       'base_unittests': {},
       'browser_tests': {
@@ -5587,8 +5624,11 @@
 
     'webview_bot_gtests': [
       'system_webview_shell_instrumentation_tests',
+      'system_webview_shell_instrumentation_tests_no_field_trial',
       'webview_ui_instrumentation_tests',
+      'webview_ui_instrumentation_tests_no_field_trial',
       'webview_cts_tests_gtest',
+      'webview_cts_tests_gtest_no_field_trial',
     ],
   }
 }