[bfcache] Fixing the android bfcache fyi builder.

This fixes the tests run by the android bfache fyi bot. It currently tries to
run browser_tests when it should instead run android_browsertests,
content_shell_test_apk and chrome_public_test_apk.

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

testing/buildbot/chromium.android.fyi.json

@@ -107,11 +107,11 @@
             "--bucket",
             "chromium-result-details",
             "--test-name",
-            "bf_cache_browser_tests"
+            "bf_cache_android_browsertests"
           ],
           "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
         },
-        "name": "bf_cache_browser_tests",
+        "name": "bf_cache_android_browsertests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "cipd_packages": [
@@ -141,7 +141,55 @@
           ],
           "shards": 10
         },
-        "test": "browser_tests"
+        "test": "android_browsertests"
+      },
+      {
+        "args": [
+          "--enable-features=BackForwardCache",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "bf_cache_chrome_public_test_apk"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "bf_cache_chrome_public_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",
+              "device_os_type": "userdebug",
+              "device_type": "hammerhead",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 10
+        },
+        "test": "chrome_public_test_apk"
       },
       {
         "args": [
@@ -191,6 +239,54 @@
         },
         "test": "content_browsertests"
       },
+      {
+        "args": [
+          "--enable-features=BackForwardCache",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter",
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "bf_cache_content_shell_test_apk"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "bf_cache_content_shell_test_apk",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "KTU84P",
+              "device_os_type": "userdebug",
+              "device_type": "hammerhead",
+              "os": "Android"
+            }
+          ],
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 10
+        },
+        "test": "content_shell_test_apk"
+      },
       {
         "args": [
           "--enable-features=BackForwardCache",
@@ -289,7 +385,8 @@
     "isolated_scripts": [
       {
         "args": [
-          "--num-retries=3"
+          "--num-retries=3",
+          "--additional-driver-flag=--enable-features=BackForwardCache"
         ],
         "isolate_name": "blink_web_tests_exparchive",
         "merge": {

testing/buildbot/test_suite_exceptions.pyl

@@ -1811,6 +1811,12 @@
           '--additional-driver-flag=--disable-blink-features=LayoutNG',
         ],
       },
+      # chromium.android.fyi
+      'android-bfcache-rel': {
+        'args': [
+          '--additional-driver-flag=--enable-features=BackForwardCache',
+        ],
+      },
       # chromium.linux
       'Fuchsia x64': {
         'args': [

testing/buildbot/test_suites.pyl

@@ -194,7 +194,40 @@
       'wm_unittests': {},
     },
 
-    'bfcache_gtests': {
+    'bfcache_android_specific_gtests': {
+      'bf_cache_android_browsertests': {
+        'args': [
+          '--enable-features=BackForwardCache',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+        ],
+        'swarming': {
+          'shards': 10,
+        },
+       'test': 'android_browsertests',
+      },
+      'bf_cache_content_shell_test_apk': {
+        'args': [
+          '--enable-features=BackForwardCache',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+        ],
+        'swarming': {
+          'shards': 10,
+        },
+       'test': 'content_shell_test_apk',
+      },
+      'bf_cache_chrome_public_test_apk': {
+        'args': [
+          '--enable-features=BackForwardCache',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/bfcache.browser_tests.filter'
+        ],
+        'swarming': {
+          'shards': 10,
+        },
+       'test': 'chrome_public_test_apk',
+      },
+    },
+
+    'bfcache_generic_gtests': {
       'bf_cache_content_unittests': {
         'args': [
           '--enable-features=BackForwardCache',
@@ -219,6 +252,9 @@
         },
         'test': 'content_browsertests',
       },
+    },
+
+    'bfcache_linux_specific_gtests': {
       'bf_cache_browser_tests': {
         'args': [
           '--enable-features=BackForwardCache',
@@ -5062,6 +5098,16 @@
       # O only.
     ],
 
+    'bfcache_android_gtests': [
+      'bfcache_generic_gtests',
+      'bfcache_android_specific_gtests',
+    ],
+
+    'bfcache_linux_gtests': [
+      'bfcache_generic_gtests',
+      'bfcache_linux_specific_gtests',
+    ],
+
     'chromium_android_gtests': [
       'android_smoke_tests',
       'android_specific_chromium_gtests',  # Already includes gl_gtests.

testing/buildbot/waterfalls.pyl

@@ -667,7 +667,7 @@
         ],
         'os_type': 'android',
         'test_suites': {
-          'gtest_tests': 'bfcache_gtests',
+          'gtest_tests': 'bfcache_android_gtests',
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         }
       },
@@ -1770,7 +1770,7 @@
           'linux-xenial',
         ],
         'test_suites': {
-          'gtest_tests': 'bfcache_gtests',
+          'gtest_tests': 'bfcache_linux_gtests',
           'isolated_scripts': 'chromium_webkit_isolated_scripts',
         },
       },