Skip mulitple-dispay tests on win8

ash/display/display_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/display_controller.h"
 
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
@@ skipping 73 matching lines @@
 
 void SetDefaultDisplayLayout(DisplayLayout::Position position) {
   Shell::GetInstance()->display_controller()->
       SetDefaultDisplayLayout(DisplayLayout(position, 0));
 }
 
 class DisplayControllerShutdownTest : public test::AshTestBase {
  public:
   virtual void TearDown() OVERRIDE {
     test::AshTestBase::TearDown();
+    RETURN_IF_WIN8;
+
     // Make sure that primary display is accessible after shutdown.
     gfx::Display primary = Shell::GetScreen()->GetPrimaryDisplay();
     EXPECT_EQ("0,0 444x333", primary.bounds().ToString());
     EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   }
 };
 
 class TestEventHandler : public ui::EventHandler {
  public:
   TestEventHandler() : target_root_(NULL),
@@ skipping 75 matching lines @@
 
 float GetStoredUIScale(int64 id) {
   return Shell::GetInstance()->display_manager()->GetDisplayInfo(id).ui_scale();
 }
 
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
 TEST_F(DisplayControllerShutdownTest, Shutdown) {
+  RETURN_IF_WIN8;
+
   UpdateDisplay("444x333, 200x200");
 }
 
 TEST_F(DisplayControllerTest, SecondaryDisplayLayout) {
+  RETURN_IF_WIN8;
+
   TestObserver observer;
   UpdateDisplay("500x500,400x400");
   EXPECT_EQ(1, observer.CountAndReset());  // resize and add
   gfx::Display* secondary_display =
       Shell::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   // Default layout is RIGHT.
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
@@ skipping 50 matching lines @@
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("400,500 400x400", GetSecondaryDisplay().bounds().ToString());
 
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::BOTTOM, -400);
   EXPECT_EQ(1, observer.CountAndReset());  // resize and add
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("-300,500 400x400", GetSecondaryDisplay().bounds().ToString());
 }
 
 TEST_F(DisplayControllerTest, BoundsUpdated) {
+  RETURN_IF_WIN8;
+
   TestObserver observer;
   SetDefaultDisplayLayout(DisplayLayout::BOTTOM);
   UpdateDisplay("200x200,300x300");  // layout, resize and add.
   EXPECT_EQ(1, observer.CountAndReset());
 
   internal::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   gfx::Display* secondary_display = display_manager->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
@@ skipping 41 matching lines @@
   EXPECT_EQ(1, observer.CountAndReset());
   display_manager->SetDisplayUIScale(secondary_id, 1.125f);
   EXPECT_EQ(0, observer.CountAndReset());
   display_manager->SetDisplayUIScale(primary_id, 1.125f);
   EXPECT_EQ(0, observer.CountAndReset());
   display_manager->SetDisplayUIScale(primary_id, 1.125f);
   EXPECT_EQ(0, observer.CountAndReset());
 }
 
 TEST_F(DisplayControllerTest, MirroredLayout) {
+  RETURN_IF_WIN8;
+
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   UpdateDisplay("500x500,400x400");
   EXPECT_FALSE(display_controller->GetCurrentDisplayLayout().mirrored);
   EXPECT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ(
       2U, Shell::GetInstance()->display_manager()->num_connected_displays());
 
   UpdateDisplay("500x500,1+0-500x500");
   EXPECT_TRUE(display_controller->GetCurrentDisplayLayout().mirrored);
@@ skipping 31 matching lines @@
             DisplayLayout(DisplayLayout::TOP, -70).Invert().ToString());
 
   EXPECT_EQ("top, 0",
             DisplayLayout(DisplayLayout::BOTTOM, 0).Invert().ToString());
   EXPECT_EQ("top, -70",
             DisplayLayout(DisplayLayout::BOTTOM, 70).Invert().ToString());
   EXPECT_EQ("top, 80",
             DisplayLayout(DisplayLayout::BOTTOM, -80).Invert().ToString());
 }
 
-// Crashes flakily on win8 aura bots: crbug.com/237642
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_SwapPrimary DISABLED_SwapPrimary
-#else
-#define MAYBE_SwapPrimary SwapPrimary
-#endif
-TEST_F(DisplayControllerTest, MAYBE_SwapPrimary) {
+TEST_F(DisplayControllerTest, SwapPrimary) {
+  RETURN_IF_WIN8;
+
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,300x300");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
   DisplayLayout display_layout(DisplayLayout::RIGHT, 50);
   display_controller->SetLayoutForCurrentDisplays(display_layout);
 
@@ skipping 65 matching lines @@
   EXPECT_EQ(primary_display.id(),
             Shell::GetScreen()->GetDisplayNearestPoint(
                 gfx::Point(-100, -100)).id());
   EXPECT_EQ(primary_display.id(),
             Shell::GetScreen()->GetDisplayNearestWindow(NULL).id());
   EXPECT_TRUE(tracker.Contains(primary_root));
   EXPECT_FALSE(tracker.Contains(secondary_root));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
 }
 
-// Crashes flakily on win8 aura bots: crbug.com/237642
-#if defined(OS_WIN) && defined(USE_AURA)
-#define MAYBE_SwapPrimaryById DISABLED_SwapPrimaryById
-#else
-#define MAYBE_SwapPrimaryById SwapPrimaryById
-#endif
-TEST_F(DisplayControllerTest, MAYBE_SwapPrimaryById) {
+TEST_F(DisplayControllerTest, SwapPrimaryById) {
+  RETURN_IF_WIN8;
+
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,300x300");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
   DisplayLayout display_layout(DisplayLayout::RIGHT, 50);
   display_controller->SetLayoutForCurrentDisplays(display_layout);
 
@@ skipping 100 matching lines @@
   EXPECT_EQ(third_display_info.id(), ScreenAsh::GetSecondaryDisplay().id());
   EXPECT_EQ(
       primary_root,
       display_controller->GetRootWindowForDisplayId(primary_display.id()));
   EXPECT_NE(
       primary_root,
       display_controller->GetRootWindowForDisplayId(third_display_info.id()));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
 }
 
-#if defined(OS_WIN)
-// Flaky failures on Win8 due to window activation messages. crbug.com/239539
-#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
-    DISABLED_CursorDeviceScaleFactorSwapPrimary
-#else
-#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
-    CursorDeviceScaleFactorSwapPrimary
-#endif
-TEST_F(DisplayControllerTest, MAYBE_CursorDeviceScaleFactorSwapPrimary) {
+TEST_F(DisplayControllerTest, CursorDeviceScaleFactorSwapPrimary) {
+  RETURN_IF_WIN8;
+
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,200x200*2");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
   aura::RootWindow* primary_root =
       display_controller->GetRootWindowForDisplayId(primary_display.id());
   aura::RootWindow* secondary_root =
@@ skipping 32 matching lines @@
   // Cursor's device scale factor should be updated even without moving cursor.
   EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
 
   primary_root->MoveCursorTo(gfx::Point(50, 50));
   EXPECT_EQ(1.0f,
             primary_root->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
   EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
 }
 
 #if defined(OS_WIN)
-// TODO(oshima): On Windows, we don't update the origin/size right away.
+// TODO(scottmg): RootWindow doesn't get resized on Windows
+// Ash. http://crbug.com/247916.
 #define MAYBE_UpdateDisplayWithHostOrigin DISABLED_UpdateDisplayWithHostOrigin
 #else
 #define MAYBE_UpdateDisplayWithHostOrigin UpdateDisplayWithHostOrigin
 #endif
 
 TEST_F(DisplayControllerTest, MAYBE_UpdateDisplayWithHostOrigin) {
   UpdateDisplay("100x200,300x400");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   Shell::RootWindowList root_windows =
       Shell::GetInstance()->GetAllRootWindows();
@@ skipping 19 matching lines @@
   EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString());
 
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
   EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
   EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
   EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString());
 }
 
-#if defined(OS_WIN)
-// TODO(oshima): Windows does not supoprts insets.
-#define MAYBE_OverscanInsets DISABLED_OverscanInsets
-#else
-#define MAYBE_OverscanInsets OverscanInsets
-#endif
+TEST_F(DisplayControllerTest, OverscanInsets) {
+  RETURN_IF_WIN8;
 
-TEST_F(DisplayControllerTest, MAYBE_OverscanInsets) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("120x200,300x400*2");
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
 
   display_controller->SetOverscanInsets(display1.id(),
@@ skipping 11 matching lines @@
   EXPECT_EQ("0,0 120x200", root_windows[0]->bounds().ToString());
   EXPECT_EQ("120,0 150x200",
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
 
   generator.MoveMouseToInHost(30, 20);
   EXPECT_EQ("30,20", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-#if defined(OS_WIN)
-// On Win8 bots, the host window can't be resized and
-// SetTransform updates the window using the orignal host window
-// size.
-#define MAYBE_Rotate DISABLED_Rotate
-#define MAYBE_ScaleRootWindow DISABLED_ScaleRootWindow
-#define MAYBE_TouchScale DISABLED_TouchScale
-#define MAYBE_ConvertHostToRootCoords DISABLED_ConvertHostToRootCoords
-#else
-#define MAYBE_Rotate Rotate
-#define MAYBE_ScaleRootWindow ScaleRootWindow
-#define MAYBE_TouchScale TouchScale
-#define MAYBE_ConvertHostToRootCoords ConvertHostToRootCoords
-#endif
+TEST_F(DisplayControllerTest, Rotate) {
+  RETURN_IF_WIN8;
 
-TEST_F(DisplayControllerTest, MAYBE_Rotate) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   internal::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("120x200,300x400*2");
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   int64 display2_id = ScreenAsh::GetSecondaryDisplay().id();
@@ skipping 47 matching lines @@
             ScreenAsh::GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ(gfx::Display::ROTATE_180, GetStoredRotation(display1.id()));
   EXPECT_EQ(gfx::Display::ROTATE_270, GetStoredRotation(display2_id));
 
   generator1.MoveMouseToInHost(50, 40);
   EXPECT_EQ("69,159", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-TEST_F(DisplayControllerTest, MAYBE_ScaleRootWindow) {
+TEST_F(DisplayControllerTest, ScaleRootWindow) {
+  RETURN_IF_WIN8;
+
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2@1.5,500x300");
 
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display::SetInternalDisplayId(display1.id());
 
   gfx::Display display2 = ScreenAsh::GetSecondaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ skipping 14 matching lines @@
   display2 = ScreenAsh::GetSecondaryDisplay();
   EXPECT_EQ("0,0 375x250", display1.bounds().ToString());
   EXPECT_EQ("0,0 375x250", root_windows[0]->bounds().ToString());
   EXPECT_EQ("375,0 500x300", display2.bounds().ToString());
   EXPECT_EQ(1.25f, GetStoredUIScale(display1.id()));
   EXPECT_EQ(1.0f, GetStoredUIScale(display2.id()));
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-TEST_F(DisplayControllerTest, MAYBE_TouchScale) {
+TEST_F(DisplayControllerTest, TouchScale) {
+  RETURN_IF_WIN8;
+
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("200x200*2");
   gfx::Display display = Shell::GetScreen()->GetPrimaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::RootWindow* root_window = root_windows[0];
   aura::test::EventGenerator generator(root_window);
 
   generator.PressMoveAndReleaseTouchTo(50, 50);
   // Default test touches have radius_x/y = 1.0, with device scale
   // factor = 2, the scaled radius_x/y should be 0.5.
   EXPECT_EQ(0.5, event_handler.touch_radius_x());
   EXPECT_EQ(0.5, event_handler.touch_radius_y());
 
   generator.ScrollSequence(gfx::Point(0,0),
                            base::TimeDelta::FromMilliseconds(100),
                            10.0, 1.0, 5, 1);
 
   // With device scale factor = 2, ordinal_offset * 2 = offset.
   EXPECT_EQ(event_handler.scroll_x_offset(),
             event_handler.scroll_x_offset_ordinal() * 2);
   EXPECT_EQ(event_handler.scroll_y_offset(),
             event_handler.scroll_y_offset_ordinal() * 2);
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
-TEST_F(DisplayControllerTest, MAYBE_ConvertHostToRootCoords) {
+TEST_F(DisplayControllerTest, ConvertHostToRootCoords) {
+  RETURN_IF_WIN8;
+
   TestEventHandler event_handler;
   Shell::GetInstance()->AddPreTargetHandler(&event_handler);
 
   UpdateDisplay("600x400*2/r@1.5");
 
   gfx::Display display1 = Shell::GetScreen()->GetPrimaryDisplay();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ("0,0 300x450", display1.bounds().ToString());
   EXPECT_EQ("0,0 300x450", root_windows[0]->bounds().ToString());
   EXPECT_EQ(1.5f, GetStoredUIScale(display1.id()));
@@ skipping 38 matching lines @@
   generator.MoveMouseToInHost(599, 399);
   EXPECT_EQ("0,449", event_handler.GetLocationAndReset());
   generator.MoveMouseToInHost(0, 399);
   EXPECT_EQ("0,0", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace test
 }  // namespace ash