tests: Don't exclude jingle_unittests from Android

After https://chromium-review.googlesource.com/c/chromium/src/+/1059613,
they should pass.

Bug: 842698
Change-Id: I758bd2ac47ed3c934591ed7083aa32a2cfc0256f
Reviewed-on: https://chromium-review.googlesource.com/1059614
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559460}

testing/buildbot/chromium.android.fyi.json

@@ -731,6 +731,12 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -944,6 +950,12 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -1631,6 +1643,32 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "jingle_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": "jingle_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -3077,6 +3115,50 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "jingle_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": "jingle_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -3915,6 +3997,12 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -4139,6 +4227,12 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -5873,6 +5967,30 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "jingle_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": "jingle_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",

testing/buildbot/chromium.clang.json

@@ -5986,6 +5986,18 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ]
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/chromium.memory.json

@@ -317,6 +317,18 @@
         },
         "test": "ipc_tests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_os": "MMB29Q",
+              "device_type": "bullhead"
+            }
+          ]
+        },
+        "test": "jingle_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true,

testing/buildbot/test_suite_exceptions.pyl

@@ -1710,31 +1710,6 @@
       },
     },
   },
-  'jingle_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',
-      # chromium.clang
-      'ToTAndroidCFI',
-      # chromium.memory
-      'Android CFI',
-    ],
-  },
   'keyboard_unittests': {
     'remove_from': [
       'Win7 Tests (dbg)(1)',