[bfcache] Fix filters for android-bfcache-rel fyi bot.

The bfcache fyi bot for android is trying to use browser_tests filters
that are not carried over. Instead we create new filter files for the
android specific tests suites we are running and include them into the
build system.

Bug: 976218
Change-Id: Ia8627aebd15fcda069c6fa227a00452963af8920
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1796558Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Arthur Hemery <ahemery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695638}

chrome/android/BUILD.gn

@@ -2007,10 +2007,13 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/profiling_host:profiling_host_javatests",
     "//chrome/browser/ui/android/widget:ui_widget_java_tests",
   ]
+
+  data_deps = [
+    "//testing/buildbot/filters:chrome_public_test_apk_filters",
+  ]
+
   if (enable_chrome_android_internal) {
-    data_deps = [
-      "//clank/build/bot/filters:chrome_public_test_apk_filters",
-    ]
+    data_deps += [ "//clank/build/bot/filters:chrome_public_test_apk_filters" ]
   }
   additional_apks = [
     "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",

chrome/test/BUILD.gn

@@ -505,6 +505,10 @@ if (is_android) {
       "//testing/android/native_test:native_test_support",
     ]
 
+    data_deps = [
+      "//testing/buildbot/filters:android_browsertests_filters",
+    ]
+
     sources = [
       "../browser/engagement/important_sites_util_browsertest.cc",
       "../browser/payments/has_enrolled_instrument_browsertest.cc",

content/shell/android/BUILD.gn

@@ -230,10 +230,12 @@ instrumentation_test_apk("content_shell_test_apk") {
   shared_libraries = [ ":libcontent_native_test" ]
   android_manifest = "javatests/AndroidManifest.xml"
 
+  data_deps = [
+    "//testing/buildbot/filters:content_shell_test_apk_filters",
+  ]
+
   if (enable_chrome_android_internal) {
-    data_deps = [
-      "//clank/build/bot/filters:content_shell_test_apk_filters",
-    ]
+    data_deps += [ "//clank/build/bot/filters:content_shell_test_apk_filters" ]
   }
 }
 

testing/buildbot/chromium.android.fyi.json

@@ -98,7 +98,7 @@
       {
         "args": [
           "--enable-features=BackForwardCache",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.android_browsertests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -146,7 +146,7 @@
       {
         "args": [
           "--enable-features=BackForwardCache",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.chrome_public_test_apk.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -242,7 +242,7 @@
       {
         "args": [
           "--enable-features=BackForwardCache",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.content_shell_test_apk.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

testing/buildbot/filters/BUILD.gn

@@ -16,6 +16,14 @@
 # $ for i in $(ls -1 testing/buildbot/filters/*.browser_tests.*filter ); \
 #   do echo "    \"//$i\","; done | sort
 
+source_set("android_browsertests_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/bfcache.android_browsertests.filter",
+  ]
+}
+
 source_set("blink_web_tests_filter") {
   testonly = true
 
@@ -45,6 +53,14 @@ source_set("browser_tests_filters") {
   ]
 }
 
+source_set("chrome_public_test_apk_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/bfcache.chrome_public_test_apk.filter",
+  ]
+}
+
 source_set("chromeos_filters") {
   data = [
     "//testing/buildbot/filters/chromeos.base_unittests.filter",
@@ -55,15 +71,6 @@ source_set("chromeos_filters") {
   ]
 }
 
-source_set("content_unittests_filters") {
-  testonly = true
-
-  data = [
-    "//testing/buildbot/filters/bfcache.content_unittests.filter",
-    "//testing/buildbot/filters/webrtc.content_unittests.filter",
-  ]
-}
-
 source_set("content_browsertests_filters") {
   testonly = true
 
@@ -78,6 +85,23 @@ source_set("content_browsertests_filters") {
   ]
 }
 
+source_set("content_shell_test_apk_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/bfcache.content_shell_test_apk.filter",
+  ]
+}
+
+source_set("content_unittests_filters") {
+  testonly = true
+
+  data = [
+    "//testing/buildbot/filters/bfcache.content_unittests.filter",
+    "//testing/buildbot/filters/webrtc.content_unittests.filter",
+  ]
+}
+
 source_set("fuchsia_filters") {
   data = [
     "//testing/buildbot/filters/fuchsia.base_perftests.filter",

testing/buildbot/filters/bfcache.android_browsertests.filter

+# These tests currently fail when run with --enable-features=BackForwardCache

testing/buildbot/filters/bfcache.chrome_public_test_apk.filter

+# These tests currently fail when run with --enable-features=BackForwardCache

testing/buildbot/filters/bfcache.content_shell_test_apk.filter

+# These tests currently fail when run with --enable-features=BackForwardCache

testing/buildbot/test_suites.pyl

@@ -208,7 +208,7 @@
       'bf_cache_android_browsertests': {
         'args': [
           '--enable-features=BackForwardCache',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.android_browsertests.filter'
         ],
         'swarming': {
           'shards': 10,
@@ -218,7 +218,7 @@
       'bf_cache_content_shell_test_apk': {
         'args': [
           '--enable-features=BackForwardCache',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.content_shell_test_apk.filter'
         ],
         'swarming': {
           'shards': 10,
@@ -228,7 +228,7 @@
       'bf_cache_chrome_public_test_apk': {
         'args': [
           '--enable-features=BackForwardCache',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.chrome_public_test_apk.filter'
         ],
         'swarming': {
           'shards': 10,