Adds ash_mus_unittests to FYI bot

ash/display/screen_position_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/screen_position_controller.h"
 
 #include <memory>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 
-#if defined(OS_WIN)
-// TODO(scottmg): RootWindow doesn't get resized immediately on Windows
-// Ash. http://crbug.com/247916.
-#define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen
-#define MAYBE_ConvertHostPointToScreenHiDPI \
-  DISABLED_ConvertHostPointToScreenHiDPI
-#define MAYBE_ConvertHostPointToScreenRotate \
-  DISABLED_ConvertHostPointToScreenRotate
-#define MAYBE_ConvertHostPointToScreenUIScale \
-  DISABLED_ConvertHostPointToScreenUIScale
-#define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
-  DISABLED_ConvertToScreenWhileRemovingSecondaryDisplay
-#else
-#define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen
-#define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI
-#define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate
-#define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale
-#define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \
-  ConvertToScreenWhileRemovingSecondaryDisplay
-#endif
-
 namespace ash {
 namespace test {
 
 namespace {
 
 ScreenPositionController* GetScreenPositionController() {
   ShellTestApi test_api(Shell::Get());
   return test_api.screen_position_controller();
 }
 
@@ skipping 35 matching lines @@
  protected:
   std::unique_ptr<aura::Window> window_;
   aura::test::TestWindowDelegate window_delegate_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenPositionControllerTest);
 };
 
 }  // namespace
 
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreen) {
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreen) {
   // Make sure that the point is in host coordinates. (crbug.com/521919)
   UpdateDisplay("100+100-200x200,100+300-200x200");
   // The point 150,210 should be in host coords, and detected as outside.
   EXPECT_EQ("350,10", ConvertHostPointToScreen(150, 210));
 
   UpdateDisplay("100+100-200x200,100+500-200x200");
 
   aura::Window::Windows root_windows = Shell::Get()->GetAllRootWindows();
   EXPECT_EQ(
       "100,100",
@@ skipping 72 matching lines @@
 
   SetSecondaryDisplayLayout(display::DisplayPlacement::TOP);
   // The point is on the secondary display.
   EXPECT_EQ("50,-150", ConvertHostPointToScreen(50, 50));
   // The point is out of the all root windows.
   EXPECT_EQ("250,50", ConvertHostPointToScreen(250, 250));
   // The point is on the primary root window.
   EXPECT_EQ("50,0", ConvertHostPointToScreen(50, -400));
 }
 
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenHiDPI) {
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenHiDPI) {
   UpdateDisplay("50+50-200x200*2,50+300-300x300");
 
   aura::Window::Windows root_windows = Shell::Get()->GetAllRootWindows();
   EXPECT_EQ("50,50 200x200",
             root_windows[0]->GetHost()->GetBoundsInPixels().ToString());
   EXPECT_EQ("50,300 300x300",
             root_windows[1]->GetHost()->GetBoundsInPixels().ToString());
 
   // Put |window_| to the primary 2x display.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
@@ skipping 10 matching lines @@
   // so the screen position is (100,0) + (150,200).
   EXPECT_EQ("250,200", ConvertHostPointToScreen(150, 450));
 
   // At the edge but still in the primary display.  Remaining of the primary
   // display is (50, 50) but adding ~100 since it's 2x-display.
   EXPECT_EQ("79,79", ConvertHostPointToScreen(158, 158));
   // At the edge of the secondary display.
   EXPECT_EQ("80,80", ConvertHostPointToScreen(160, 160));
 }
 
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenRotate) {
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenRotate) {
   // 1st display is rotated 90 clockise, and 2nd display is rotated
   // 270 clockwise.
   UpdateDisplay("100+100-200x200/r,100+500-200x200/l");
   // Put |window_| to the 1st.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
                              display::Screen::GetScreen()->GetPrimaryDisplay());
 
   // The point is on the 1st host.
   EXPECT_EQ("70,149", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
@@ skipping 11 matching lines @@
   // The point is on the 2nd host. (50,70) on 2n host -
   // roatate 270 clockwise -> (129,50) -layout [+(200,0)] -> (329,50)
   EXPECT_EQ("329,50", ConvertHostPointToScreen(50, 70));
   // The point is out of the host windows.
   EXPECT_EQ("449,50", ConvertHostPointToScreen(50, -50));
   // The point is on the 2nd host. Point on 2nd host (50,50) -
   // rotate 90 clockwise -> (50, 149)
   EXPECT_EQ("50,149", ConvertHostPointToScreen(50, -350));
 }
 
-TEST_F(ScreenPositionControllerTest, MAYBE_ConvertHostPointToScreenUIScale) {
+TEST_F(ScreenPositionControllerTest, ConvertHostPointToScreenUIScale) {
   // 1st display is 2x density with 1.5 UI scale.
   UpdateDisplay("100+100-200x200*2@1.5,100+500-200x200");
   // Put |window_| to the 1st.
   window_->SetBoundsInScreen(gfx::Rect(20, 20, 50, 50),
                              display::Screen::GetScreen()->GetPrimaryDisplay());
 
   // The point is on the 1st host.
   EXPECT_EQ("45,45", ConvertHostPointToScreen(60, 60));
   // The point is out of the host windows.
   EXPECT_EQ("45,225", ConvertHostPointToScreen(60, 300));
@@ skipping 47 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ConvertToScreenEventHandler);
 };
 
 }  // namespace
 
 // Test that events are only dispatched when a ScreenPositionClient is available
 // to convert the event to screen coordinates. The ScreenPositionClient is
 // detached from the root window prior to the root window being destroyed. Test
 // that no events are dispatched at this time.
 TEST_F(ScreenPositionControllerTest,
-       MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay) {
+       ConvertToScreenWhileRemovingSecondaryDisplay) {
   UpdateDisplay("600x600,600x600");
   RunAllPendingInMessageLoop();
 
   // Create a window on the secondary display.
   window_->SetBoundsInScreen(gfx::Rect(600, 0, 400, 400),
                              display_manager()->GetSecondaryDisplay());
 
   // Move the mouse cursor over |window_|. Synthetic mouse moves are dispatched
   // asynchronously when a window which contains the mouse cursor is destroyed.
   // We want to check that none of these synthetic events are dispatched after
@@ skipping 20 matching lines @@
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash