Android test exclusions: don't exclude google_apis_unittests

These tests do pass on some bots, e.g. [1], and it's not clear why they were
being excluded. If there's a legitimate reason for them not to run on Android,
let's figure it out and get a bug filed.

Sheriffs: if this causes the tests to start failing on Android bots, please
file a bug with information about the error, put the exclusion back and
reference the bug.

(This also enables it on a Windows and some Cast bots; it probably passes
on those too.)

Bug: 842698

 [1] https://ci.chromium.org/buildbot/chromium.clang/ToTAndroid/3343

R=kbr@chromium.org, thakis@chromium.org

Change-Id: I28c59b515fbbd757783ab7c8f54f84557b9c0c67
Reviewed-on: https://chromium-review.googlesource.com/1063729
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559514}

testing/buildbot/chromium.android.fyi.json

@@ -719,6 +719,12 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -944,6 +950,12 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -1602,6 +1614,32 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "google_apis_unittests"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "LMY47W",
+              "device_type": "sprout"
+            }
+          ],
+          "expiration": 14400
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -3065,6 +3103,50 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "google_apis_unittests"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "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": "NRD91N",
+              "device_type": "bullhead"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 960,
+          "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"
+            }
+          ]
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -4063,6 +4145,12 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -4299,6 +4387,12 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -6012,6 +6106,30 @@
         },
         "test": "gl_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "google_apis_unittests"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_type": "gce_x86"
+            }
+          ]
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/chromium.linux.json

@@ -106,6 +106,12 @@
         },
         "test": "crypto_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -321,6 +327,12 @@
         },
         "test": "crypto_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.win.json

@@ -2612,6 +2612,12 @@
         },
         "test": "gn_unittests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "google_apis_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suite_exceptions.pyl

@@ -1521,32 +1521,6 @@
       'Out of Process Profiling Mac',
     ],
   },
-  'google_apis_unittests': {
-    'remove_from': [
-      # On chromium.android, unclear why these aren't run.
-      'KitKat Phone Tester (dbg)',
-      'KitKat Phone Tester (rel)',
-      'KitKat Tablet Tester',
-      'Lollipop Phone Tester',
-      'Lollipop Tablet Tester',
-      'Marshmallow 64 bit Tester',
-      'Marshmallow Phone Tester (rel)',
-      'Marshmallow Tablet Tester',
-      'Nougat Phone Tester',
-      # chromium.android.fyi
-      'Jelly Bean Tester',
-      'Lollipop Consumer Tester',
-      'Lollipop Low-end Tester',
-      'Unswarmed N5 Tests Dummy Builder',
-      'Unswarmed N5X Tests Dummy Builder',
-      'x86 Cloud Tester',
-      # On chromium.linux, unclear why these aren't run on Cast.
-      'Cast Audio Linux',
-      'Cast Linux',
-      # chromium.win
-      'Win7 Tests (dbg)(1)',
-    ],
-  },
   'headless_browsertests': {
     'remove_from': [
       'Linux Tests (dbg)(1)(32)',