Update Mojo Android FYI Viz config

Currently all viz and surface sync tests on the Mojo Android FYI bot are hitting shard timeouts.

This updates the tests to use filter lists, to remove tests that were causing the shards to timeout.
This also remove viz_content_unittests as I'm currently seeing infra failures from it. It will require local debugging.

TEST=surface_sync_content_browsertest, viz_content_browsertests

Bug: 849746
Change-Id: I237aab39e1c4a016584940fa0362a39db4be3434
Reviewed-on: https://chromium-review.googlesource.com/1102699Reviewed-by: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568567}

testing/buildbot/chromium.fyi.json

@@ -1676,6 +1676,7 @@
       {
         "args": [
           "--enable-surface-synchronization",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/surface_sync.content_browsertests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -1723,7 +1724,7 @@
       {
         "args": [
           "--enable-features=VizDisplayCompositor",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/viz.android.content_browsertests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -1767,53 +1768,6 @@
           "shards": 2
         },
         "test": "content_browsertests"
-      },
-      {
-        "args": [
-          "--enable-features=VizDisplayCompositor",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter",
-          "--gs-results-bucket=chromium-result-details",
-          "--recover-devices"
-        ],
-        "merge": {
-          "args": [
-            "--bucket",
-            "chromium-result-details",
-            "--test-name",
-            "viz_content_unittests"
-          ],
-          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
-        },
-        "name": "viz_content_unittests",
-        "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": "MMB29Q",
-              "device_type": "bullhead",
-              "os": "Android"
-            }
-          ],
-          "hard_timeout": 3600,
-          "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": "content_unittests"
       }
     ]
   },

testing/buildbot/filters/BUILD.gn

@@ -41,6 +41,8 @@ source_set("content_browsertests_filters") {
     "//testing/buildbot/filters/cast-linux.content_browsertests.filter",
     "//testing/buildbot/filters/mojo.fyi.network_content_browsertests.filter",
     "//testing/buildbot/filters/site-per-process.content_browsertests.filter",
+    "//testing/buildbot/filters/surface_sync.content_browsertests.filter",
+    "//testing/buildbot/filters/viz.android.content_browsertests.filter",
     "//testing/buildbot/filters/viz.content_browsertests.filter",
   ]
 }

testing/buildbot/filters/surface_sync.content_browsertests.filter

+# Android failures
+# TODO(jonross): Triage these
+-CompositorEventAckBrowserTest.*
+-NavigationHandleImplBrowserTest.BlockCredentialedSubresources
+-*CompositorImplLowEndBrowserTest.*
+-SitePerProcess*
+-ScrollLatencyBrowserTest.SmoothWheelScroll
+-TouchInputBrowserTest.TouchHandlerConsume
+-TouchSelectionControllerClientAndroidSiteIsolationTest.BasicSelectionIsolatedIframe

testing/buildbot/filters/viz.android.content_browsertests.filter

+# Android Failures
+# TODO(jonross): Triage these
+-CompositorEventAckBrowserTest.*
+-ContentBrowserTestSanityTest.SingleProcess
+-DomSerializerTests.SerializeHTMLDOMWithAddingMOTW
+-DomSerializerTests.SerializeHTMLDOMWithBaseTag
+-DomSerializerTests.SerializeHTMLDOMWithEmptyHead
+-DomSerializerTests.SerializeHTMLDOMWithEntitiesInAttributeValue
+-DomSerializerTests.SerializeHTMLDOMWithEntitiesInText
+-DomSerializerTests.SerializeHTMLDOMWithNonStandardEntities
+-DomSerializerTests.SerializeHTMLDOMWithoutDocType
+-DomSerializerTests.SerializeXMLDocWithBuiltInEntities
+-DomSerializerTests.SubResourceForElementsInNonHTMLNamespace
+-IndexedDBBrowserTestSingleProcess.RenderThreadShutdownTest
+-P/CompositorImplLowEndBrowserTest.CompositorImplDropsResourcesOnBackground/0
+-RenderThreadImplDiscardableMemoryBrowserTest.DiscardableMemoryAddressSpace
+-RenderThreadImplDiscardableMemoryBrowserTest.LockDiscardableMemory
+-RenderThreadImplDiscardableMemoryBrowserTest.ReleaseFreeDiscardableMemory
+-RenderThreadImplDiscardableMemoryBrowserTest.ReleaseFreeMemory
+-RenderViewBrowserTest.ConfirmCacheInformationPlumbed
+-ResourceFetcherTests.ResourceFetcher404
+-ResourceFetcherTests.ResourceFetcherDeletedInCallback
+-ResourceFetcherTests.ResourceFetcherDidFail
+-ResourceFetcherTests.ResourceFetcherDownload
+-ResourceFetcherTests.ResourceFetcherPost
+-ResourceFetcherTests.ResourceFetcherRedirect
+-ResourceFetcherTests.ResourceFetcherSetHeader
+-ResourceFetcherTests.ResourceFetcherTimeout
+-SavableResourcesTest.GetSavableResourceLinksWithPageHasInvalidLinks
+-SavableResourcesTest.GetSavableResourceLinksWithPageHasValidLinks
+-SavableResourcesTest.GetSavableResourceLinksWithPageHasValidStyleLink
+-ScrollLatencyBrowserTest.SmoothWheelScroll
+-SingleProcessMemoryTracingTest.BrowserInitiatedSingleDump
+-SingleProcessMemoryTracingTest.ManyInterleavedDumps
+-SingleProcessMemoryTracingTest.RendererInitiatedSingleDump
+-SitePerProcessHitTestBrowserTest.CrossProcessTooltipTestAndroid/1
+-SitePerProcessHitTestBrowserTest.CrossProcessTooltipTestAndroid/2
+-TouchInputBrowserTest.TouchHandlerConsume
+-TouchInputBrowserTest.TouchHandlerNoConsume
+-TouchSelectionControllerClientAndroidSiteIsolationTest.BasicSelectionIsolatedIframe
+
+## Base viz.content_browsertests.filter since we cannot chain filter files
+# SynchronizeVisualPropertiesMessageFilter::WaitForRect() times out.
+# https://crbug.com/848825
+-SitePerProcessBrowserTest.ViewBoundsInNestedFrameTest
+
+#### Hit Testing
+# Test failure: https://crbug.com/848325
+-SitePerProcessHitTestBrowserTest.RootConsumesScrollDuringOverscrollGesture*
+
+# InputEventAckWaiter never receives the event: https://crbug.com/848348
+-SitePerProcessHitTestBrowserTest.CrossProcessMouseEnterAndLeaveTest*
+-SitePerProcessHitTestBrowserTest.CrossProcessMouseCapture*
+-SitePerProcessHitTestBrowserTest.TouchpadPinchOverOOPIF*
+
+# /2 Variant does not handle overlapping surfaces: https://crbug.com/846798
+-SitePerProcessHitTestBrowserTest.HitTestStaleDataDeletedView*
+
+### Mac
+# BrowserSideFlingBrowserTest timing out https://crbug.com/842325
+-BrowserSideFlingBrowserTest.AutoscrollFling
+-BrowserSideFlingBrowserTest.TouchpadFling
+-BrowserSideFlingBrowserTest.TouchscreenFling
+-SitePerProcessBrowserTest.TouchpadGestureFlingStart
+-SitePerProcessBrowserTest.TouchscreenGestureFlingStart

testing/buildbot/test_suites.pyl

@@ -2266,6 +2266,7 @@
      'surface_sync_content_browsertests': {
       'args': [
         '--enable-surface-synchronization',
+	'--test-launcher-filter-file=../../testing/buildbot/filters/surface_sync.content_browsertests.filter',
       ],
       'swarming': {
         'shards': 2,
@@ -2275,20 +2276,13 @@
     'viz_content_browsertests': {
       'args': [
         '--enable-features=VizDisplayCompositor',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_browsertests.filter',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/viz.android.content_browsertests.filter',
       ],
       'swarming': {
         'shards': 2,
       },
       'test': 'content_browsertests',
     },
-    'viz_content_unittests': {
-      'args': [
-        '--enable-features=VizDisplayCompositor',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/viz.content_unittests.filter',
-      ],
-      'test': 'content_unittests',
-    },
   },
 
   'vr_platform_specific_chromium_gtests': {