Android test exclusions: don't exclude webkit_unit_tests

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.

Disable ProtocolParserTest.Reading on Android until it's fixed,
see the third bug.

(The CrOS failure was fixed a few months ago, see crbug.com/795645)

Bug: 842698, 795645, 845816

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

R=thakis@chromium.org

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

testing/buildbot/chromium.android.fyi.json

@@ -2896,6 +2896,50 @@
         },
         "test": "vr_pixeltests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webkit_unit_tests"
+          ],
+          "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": "webkit_unit_tests"
+      },
       {
         "merge": {
           "args": [
@@ -3372,6 +3416,12 @@
         },
         "test": "vr_pixeltests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "webkit_unit_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -3698,6 +3748,12 @@
         },
         "test": "vr_pixeltests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": false
+        },
+        "test": "webkit_unit_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": false
@@ -6290,6 +6346,30 @@
         },
         "test": "vr_pixeltests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webkit_unit_tests"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "device_type": "gce_x86"
+            }
+          ]
+        },
+        "test": "webkit_unit_tests"
+      },
       {
         "merge": {
           "args": [

testing/buildbot/chromium.chromiumos.json

@@ -1061,6 +1061,12 @@
         },
         "test": "wayland_client_perftests"
       },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "webkit_unit_tests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suite_exceptions.pyl

@@ -2912,26 +2912,6 @@
     },
   },
   'webkit_unit_tests': {
-    'remove_from': [
-      # On chromium.android, unclear why these aren't run.
-      'android-kitkat-arm-rel',
-      'android-marshmallow-arm64-rel',
-      '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
-      'Unswarmed N5 Tests Dummy Builder',
-      'Unswarmed N5X Tests Dummy Builder',
-      'x86 Cloud Tester',
-      # chromium.chromiumos
-      'linux-chromeos-rel',  # crbug.com/795440
-    ],
     'modifications': {
       # chromium.memory
       'Linux ASan LSan Tests (1)': {

third_party/blink/renderer/core/inspector/protocol_parser_test.cc

@@ -4,6 +4,7 @@
 
 #include "third_party/blink/renderer/core/inspector/protocol/Protocol.h"
 
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
@@ -16,7 +17,13 @@ static std::unique_ptr<protocol::Value> ParseJSON(const String& string) {
   return protocol::StringUtil::parseJSON(string);
 }
 
-TEST(ProtocolParserTest, Reading) {
+// The test fails on Android. https://crbug.com/845816
+#if defined(OS_ANDROID)
+#define MAYBE_Reading DISABLED_Reading
+#else
+#define MAYBE_Reading Reading
+#endif
+TEST(ProtocolParserTest, MAYBE_Reading) {
   Value* tmp_value;
   std::unique_ptr<Value> root;
   std::unique_ptr<Value> root2;