mus: Run browser_tests in the now-default mode for --mus.

mus should no longer host viz for browser_tests --mus. So it should not have
--mus=viz flag set. With this change, the browser_tests no longer need the
filter file. So remove it (from main and fyi waterfalls).

BUG=786453, 785536

Change-Id: Ia9ecfdc8f667bb07cf53debbc98f960938f6d452
Reviewed-on: https://chromium-review.googlesource.com/812169Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522341}

chrome/test/base/mash_browser_tests_main.cc

@@ -42,8 +42,10 @@ class MusTestLauncherDelegate : public ChromeTestLauncherDelegate {
     content::GetContentMainParams()->env_mode = aura::Env::Mode::MUS;
     content::GetContentMainParams()->create_discardable_memory =
         (config_ == AshConfig::MUS);
-    base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kMus, switches::kMusHostVizValue);
+    if (config_ == AshConfig::MASH) {
+      base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+          switches::kMus, switches::kMusHostVizValue);
+    }
     return ChromeTestLauncherDelegate::RunTestSuite(argc, argv);
   }
 

testing/buildbot/chromium.chromiumos.json

@@ -862,8 +862,7 @@
         "args": [
           "--mus",
           "--ozone-platform=headless",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mus.browser_tests.filter"
+          "--override-use-software-gl-for-tests"
         ],
         "name": "mus_browser_tests",
         "swarming": {

testing/buildbot/chromium.fyi.json

@@ -4268,8 +4268,7 @@
       {
         "args": [
           "--mus",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.mus.browser_tests.filter"
+          "--override-use-software-gl-for-tests"
         ],
         "name": "mus_browser_tests",
         "swarming": {

testing/buildbot/filters/BUILD.gn

@@ -31,9 +31,7 @@ source_set("browser_tests_filters") {
   data = [
     "//testing/buildbot/filters/mash.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.mash.browser_tests.filter",
-    "//testing/buildbot/filters/mojo.fyi.mus.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
-    "//testing/buildbot/filters/mus.browser_tests.filter",
     "//testing/buildbot/filters/browser_tests_cros_asan.filter",
     "//testing/buildbot/filters/site-per-process.browser_tests.filter",
   ]

testing/buildbot/filters/mojo.fyi.mus.browser_tests.filter

-# TODO: Investigate failure, http://crbug.com/754864.
--CastStreamingApiTestWithPixelOutput.EndToEnd
-
-# TODO: fails because of screen capture. http://crbug.com/754899.
--ChromeScreenshotGrabberBrowserTest.TakeScreenshot
--LoginFeedbackTest.Basic
--TabCaptureApiPixelTest.EndToEndThroughWebRTC
--TabCaptureApiPixelTest.EndToEndWithoutRemoting
--TabCaptureApiPixelTest.OffscreenTabEndToEnd
--TabCaptureApiPixelTest.OffscreenTabEvilTests
-
-# TODO: fix, see http://crbug.com/755303.
--StartupMetricsTest.ReportsValues
-
-# TODO: fix, see http://crbug.com/755318.
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/0
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/1
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/2
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/3
-
-# TODO: fix, http://crbug.com/755328
--WebViewTests/WebViewFocusTest.TouchFocusesEmbedder/0
--WebViewTests/WebViewTest.InterstitialPageFocusedWidget/1
--WebViewTests/WebViewTest.InterstitialPageRouteEvents/1
-
-# content::WaitForChildFrameSurfaceReady unsupported, https://crbug.com/763452
--PDFExtensionTest.ContextMenuCoordinates
--WebViewTests/WebViewTest.ReloadAfterCrash/1

testing/buildbot/filters/mus.browser_tests.filter

-# TODO: Investigate failure, http://crbug.com/754864.
--CastStreamingApiTestWithPixelOutput.EndToEnd
-
-# TODO: fails because of screen capture. http://crbug.com/754899.
--ChromeScreenshotGrabberBrowserTest.TakeScreenshot
--LoginFeedbackTest.Basic
--TabCaptureApiPixelTest.EndToEndThroughWebRTC
--TabCaptureApiPixelTest.EndToEndWithoutRemoting
--TabCaptureApiPixelTest.OffscreenTabEndToEnd
--TabCaptureApiPixelTest.OffscreenTabEvilTests
-
-# TODO: fix, see http://crbug.com/755303.
--StartupMetricsTest.ReportsValues
-
-# TODO: fix, see http://crbug.com/755318.
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/0
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/1
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/2
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.TestGuestGestureScrollsBubble/3
-
-# TODO: fix, http://crbug.com/755328
--WebViewTests/WebViewFocusTest.TouchFocusesEmbedder/0
--WebViewTests/WebViewTest.InterstitialPageFocusedWidget/1
--WebViewTests/WebViewTest.InterstitialPageRouteEvents/1
-
-# content::WaitForChildFrameSurfaceReady unsupported, https://crbug.com/763452
--PDFExtensionTest.ContextMenuCoordinates
--WebViewTests/WebViewTest.ReloadAfterCrash/1