Add more tests to Android Mojo bot

Adds filter files for  chrome_public_test_apk and
webview_instrumentation_test_apk as well.

Bug: 880915
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: I05e4fd7cf7234b0c8c2be824421765f9406d5c14
Reviewed-on: https://chromium-review.googlesource.com/1208442
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590022}

android_webview/test/BUILD.gn

@@ -263,6 +263,9 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
   data = [
     "data/",
   ]
+  data_deps = [
+    "//testing/buildbot/filters:webview_instrumentation_test_apk_filters",
+  ]
 
   # We only want to bother including these on bots set up for VR testing
   if (include_vr_data) {

chrome/android/BUILD.gn

@@ -291,8 +291,8 @@ android_library("chrome_java") {
     "//third_party/blink/public/mojom:android_mojo_bindings_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
-    "//third_party/custom_tabs_client:custom_tabs_support_java",
     "//third_party/cct_dynamic_module:cct_dynamic_module_java",
+    "//third_party/custom_tabs_client:custom_tabs_support_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/leakcanary:leakcanary_java",
@@ -1564,6 +1564,10 @@ instrumentation_test_apk("chrome_public_test_apk") {
     "//third_party/android_tools:android_test_runner_java",
   ]
 
+  data_deps = [
+    "//testing/buildbot/filters:chrome_public_test_apk_filters",
+  ]
+
   additional_apks = [
     "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
     "//chrome/android/webapk/shell_apk:http_webapk",

testing/buildbot/filters/BUILD.gn

@@ -46,6 +46,14 @@ source_set("chromeos_filters") {
   ]
 }
 
+source_set("chrome_public_test_apk_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter",
+  ]
+}
+
 source_set("content_unittests_filters") {
   testonly = true
 
@@ -88,3 +96,11 @@ source_set("interactive_ui_tests_filters") {
     "//testing/buildbot/filters/webui_polymer2_interactive_ui_tests.filter",
   ]
 }
+
+source_set("webview_instrumentation_test_apk_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter",
+  ]
+}

testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter

+# NOTE: if adding an exclusion for an existing failure (e.g. additional test for
+# feature X that is already not working), please add it beside the existing
+# failures. Otherwise please reach out to network-service-dev@.
+
+# These tests currently fail when run with --enable-features=NetworkService
+
+# Uncategorized timeouts or test failures.
+-org.chromium.chrome.browser.externalnav.UrlOverridingTest.testNavigationFromUserGestureInSubFrame
+
+# Fails because it expects to have no features enabled when run.
+-org.chromium.chrome.browser.FeaturesAnnotationsTest.testFeaturesSetExistingFlags
+
+# http://crbug.com/882019
+-org.chromium.chrome.browser.UrlSchemeTest.testContentUrlAccess
+-org.chromium.chrome.browser.UrlSchemeTest.testContentUrlIframeAccessFromContentUrl
+-org.chromium.chrome.browser.UrlSchemeTest.testContentUrlImageFromContentUrl
+
+# https://crbug.com/721403
+-org.chromium.chrome.browser.infobar.InfoBarTest.testDataReductionPromoInfoBar
+
+# http://crbug.com/882060
+-org.chromium.chrome.browser.externalnav.UrlOverridingTest.testNavigationFromXHRCallback
+-org.chromium.chrome.browser.externalnav.UrlOverridingTest.testNavigationFromXHRCallbackAndShortTimeout
+-org.chromium.chrome.browser.externalnav.UrlOverridingTest.testNavigationFromXHRCallbackInSubFrame
+-org.chromium.chrome.browser.tab.InterceptNavigationDelegateTest.testNavigationFromImageOnLoad
+-org.chromium.chrome.browser.tab.InterceptNavigationDelegateTest.testNavigationFromXHRCallback
+-org.chromium.chrome.browser.tab.InterceptNavigationDelegateTest.testNavigationFromXHRCallbackAndShortTimeout

testing/buildbot/test_suites.pyl

@@ -1806,6 +1806,45 @@
       },
       'test': 'content_browsertests',
     },
+    'network_service_components_browsertests': {
+      'args': [
+        '--enable-features=NetworkService',
+      ],
+      'test': 'components_browsertests',
+    },
+    'network_service_chrome_public_test_apk': {
+      'swarming': {
+        'shards': 20,
+      },
+      'args': [
+        # TODO(crbug.com/881572): Fix crash when running network service OOP on
+        # Android.
+        '--enable-features=NetworkService,NetworkServiceInProcess',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_chrome_public_test_apk.filter',
+      ],
+      'test': 'chrome_public_test_apk',
+    },
+    'network_service_content_shell_test_apk': {
+      'swarming': {
+        'shards': 5,
+      },
+      'args': [
+        '--enable-features=NetworkService',
+      ],
+      'test': 'content_shell_test_apk',
+    },
+    'network_service_webview_instrumentation_test_apk': {
+      'swarming': {
+        'shards': 20,
+      },
+      'args': [
+        # TODO(crbug.com/881572): Fix crash when running network service OOP on
+        # Android.
+        '--enable-features=NetworkService,NetworkServiceInProcess',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter',
+      ],
+      'test': 'webview_instrumentation_test_apk',
+    },
   },
 
   'network_service_gtests': {