Remove Windows ifdefs in AshNativeCursorManagerTest

ash/wm/ash_native_cursor_manager_unittest.cc

Index: ash/wm/ash_native_cursor_manager_unittest.cc
diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc
index 35aff10e0ff01d31262850c8d2c640aca3636243..e806b749761739717d70e4345b4669de71bad6ac 100644
--- a/ash/wm/ash_native_cursor_manager_unittest.cc
+++ b/ash/wm/ash_native_cursor_manager_unittest.cc
@@ -18,11 +18,6 @@
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#include "ui/base/cursor/cursor_loader_win.h"
-#endif
-
 #if defined(USE_X11)
 #include "ui/base/cursor/cursor_loader_x11.h"
 #include "ui/resources/grit/ui_resources.h"
@@ -60,19 +55,10 @@ class MouseEventLocationDelegate : public aura::test::TestWindowDelegate {
 
 typedef test::AshTestBase AshNativeCursorManagerTest;
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Times out on Windows. http://crbug.com/584038
-#define MAYBE_LockCursor DISABLED_LockCursor
-#else
-#define MAYBE_LockCursor LockCursor
-#endif
-TEST_F(AshNativeCursorManagerTest, MAYBE_LockCursor) {
+TEST_F(AshNativeCursorManagerTest, LockCursor) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
 
-#if defined(OS_WIN)
-  ui::CursorLoaderWin::SetCursorResourceModule(L"ash_unittests.exe");
-#endif
   cursor_manager->SetCursor(ui::kCursorCopy);
   EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
   UpdateDisplay("800x800*2/r");
@@ -114,9 +100,6 @@ TEST_F(AshNativeCursorManagerTest, MAYBE_LockCursor) {
 TEST_F(AshNativeCursorManagerTest, SetCursor) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
-#if defined(OS_WIN)
-  ui::CursorLoaderWin::SetCursorResourceModule(L"ash_unittests.exe");
-#endif
   cursor_manager->SetCursor(ui::kCursorCopy);
   EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
   EXPECT_TRUE(test_api.GetCurrentCursor().platform());
@@ -141,14 +124,7 @@ TEST_F(AshNativeCursorManagerTest, SetCursorSet) {
   EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
 }
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Times out on Windows. http://crbug.com/584038
-#define MAYBE_SetDeviceScaleFactorAndRotation \
-  DISABLED_SetDeviceScaleFactorAndRotation
-#else
-#define MAYBE_SetDeviceScaleFactorAndRotation SetDeviceScaleFactorAndRotation
-#endif
-TEST_F(AshNativeCursorManagerTest, MAYBE_SetDeviceScaleFactorAndRotation) {
+TEST_F(AshNativeCursorManagerTest, SetDeviceScaleFactorAndRotation) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
   UpdateDisplay("800x100*2");
@@ -160,8 +136,6 @@ TEST_F(AshNativeCursorManagerTest, MAYBE_SetDeviceScaleFactorAndRotation) {
   EXPECT_EQ(display::Display::ROTATE_270, test_api.GetCurrentCursorRotation());
 }
 
-#if defined(OS_CHROMEOS)
-// TODO(oshima): crbug.com/143619
 TEST_F(AshNativeCursorManagerTest, FractionalScale) {
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
@@ -169,15 +143,8 @@ TEST_F(AshNativeCursorManagerTest, FractionalScale) {
   UpdateDisplay("800x100*1.25");
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
-#endif
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Times out on Windows. http://crbug.com/584038
-#define MAYBE_UIScaleShouldNotChangeCursor DISABLED_UIScaleShouldNotChangeCursor
-#else
-#define MAYBE_UIScaleShouldNotChangeCursor UIScaleShouldNotChangeCursor
-#endif
-TEST_F(AshNativeCursorManagerTest, MAYBE_UIScaleShouldNotChangeCursor) {
+TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   display::Display::SetInternalDisplayId(display_id);