Filter out ScreenshotToolTest for mus and mash

  --mash --test-launcher-filter-file=
  testing/buildbot/filters/ash_unittests_mash.filter
  --mus --test-launcher-filter-file=
  testing/buildbot/filters/ash_unittests_mus.filter

Bug: 773016
Test: ash_unittests --gtest_filter=ScreenshotTool*
Change-Id: I38fdf03b3d88fe0a2a831b950f0e95cbf6f5afcc
Test: ash_unittests --gtest_filter=ScreenshotTool*
Test: ash_unittests --gtest_filter=ScreenshotTool*
Reviewed-on: https://chromium-review.googlesource.com/721603
Commit-Queue: Vladislav Kaznacheev <kaznacheev@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509294}

ash/system/palette/tools/screenshot_unittest.cc

@@ -52,11 +52,6 @@ class ScreenshotToolTest : public AshTestBase {
 // Verifies that capturing a region triggers the partial screenshot delegate
 // method. Invoking the callback passed to the delegate disables the tool.
 TEST_F(ScreenshotToolTest, EnablingCaptureRegionCallsDelegateAndDisablesTool) {
-  // TODO(kaznacheev): Remove when screenshots work with MASH
-  // http://crbug.com/557397.
-  if (Shell::GetAshConfig() != Config::CLASSIC)
-    return;
-
   std::unique_ptr<PaletteTool> tool =
       std::make_unique<CaptureRegionMode>(palette_tool_delegate_.get());
 
@@ -100,11 +95,6 @@ TEST_F(ScreenshotToolTest, EnablingCaptureRegionCallsDelegateAndDisablesTool) {
 // Verifies that capturing the screen triggers the screenshot delegate method,
 // disables the tool, and hides the palette.
 TEST_F(ScreenshotToolTest, EnablingCaptureScreenCallsDelegateAndDisablesTool) {
-  // TODO(kaznacheev): Remove when screenshots work with MASH
-  // http://crbug.com/557397.
-  if (Shell::GetAshConfig() != Config::CLASSIC)
-    return;
-
   std::unique_ptr<PaletteTool> tool =
       std::make_unique<CaptureScreenAction>(palette_tool_delegate_.get());
   EXPECT_CALL(*palette_tool_delegate_.get(),

testing/buildbot/filters/ash_unittests_mash.filter

@@ -275,6 +275,8 @@
 -ScreenRotationAnimatorSmoothAnimationTest.ShouldRotateAfterRecreateLayers
 -ScreenshotControllerTest.BreaksCapture
 -ScreenshotControllerTest.MultipleDisplays
+-ScreenshotToolTest.EnablingCaptureRegionCallsDelegateAndDisablesTool
+-ScreenshotToolTest.EnablingCaptureScreenCallsDelegateAndDisablesTool
 -SystemGestureEventFilterTest.ControlWindowGetsMultiFingerGestureEvents
 -SystemGestureEventFilterTest.DragLeftNearEdgeSnaps
 -SystemGestureEventFilterTest.DragRightNearEdgeSnaps

testing/buildbot/filters/ash_unittests_mus.filter

@@ -4,6 +4,8 @@
 -PaletteTrayTestWithInternalStylus.WelcomeBubbleShownOnEject
 -PaletteTrayTestWithInternalStylus.WelcomeBubbleNotShownIfShownBefore
 -PaletteTrayTestWithInternalStylus.WelcomeBubbleNotShownIfAutoOpenPaletteTrue
+-ScreenshotToolTest.EnablingCaptureRegionCallsDelegateAndDisablesTool
+-ScreenshotToolTest.EnablingCaptureScreenCallsDelegateAndDisablesTool
 -TouchCalibratorControllerTest.CustomCalibration
 -TouchCalibratorControllerTest.CustomCalibrationInvalidTouchId
 -TouchCalibratorControllerTest.TouchDeviceIdIsSet