cros: Remove some OS platform ifdefs from ash

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 2013 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/touch/touch_observer_hud.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 281 matching lines @@
     event_time += base::TimeDelta::FromMilliseconds(100);
   }
 
  private:
   base::TimeTicks event_time;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudProjectionTest);
 };
 
 // Checks if debug touch HUD is correctly initialized for a single display.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_SingleDisplay DISABLED_SingleDisplay
-#else
-#define MAYBE_SingleDisplay SingleDisplay
-#endif
-TEST_F(TouchHudDebugTest, MAYBE_SingleDisplay) {
+TEST_F(TouchHudDebugTest, SingleDisplay) {
   // Setup a single display setting.
   SetupSingleDisplay();
 
   // Check if touch HUD is set correctly and associated with appropriate
   // display.
   CheckInternalDisplay();
 }
 
 // Checks if debug touch HUDs are correctly initialized for two displays.
 TEST_F(TouchHudDebugTest, DualDisplays) {
@@ skipping 170 matching lines @@
   AddInternalDisplay();
 
   // Check if the display's touch HUD is set correctly.
   EXPECT_EQ(internal_display_id(), GetPrimaryDisplay().id());
   CheckInternalDisplay();
 }
 
 // Checks projection touch HUD with a sequence of touch-pressed, touch-moved,
 // and touch-released events.
 // Test if the WM sets correct work area under different density.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_TouchMoveRelease DISABLED_TouchMoveRelease
-#else
-#define MAYBE_TouchMoveRelease TouchMoveRelease
-#endif
-TEST_F(TouchHudProjectionTest, MAYBE_TouchMoveRelease) {
+TEST_F(TouchHudProjectionTest, TouchMoveRelease) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
   EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(10, 20), 1);
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks projection touch HUD with a sequence of touch-pressed, touch-moved,
 // and touch-cancelled events.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_TouchMoveCancel DISABLED_TouchMoveCancel
-#else
-#define MAYBE_TouchMoveCancel TouchMoTouchMoveCancelveRelease
-#endif
-TEST_F(TouchHudProjectionTest, MAYBE_TouchMoveCancel) {
+TEST_F(TouchHudProjectionTest, TouchMoveCancel) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
   EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_CANCELLED, gfx::Point(10, 20), 1);
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks projection touch HUD with two simultaneous touches.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_DoubleTouch DISABLED_DoubleTouch
-#else
-#define MAYBE_DoubleTouch DoubleTouch
-#endif
-TEST_F(TouchHudProjectionTest, MAYBE_DoubleTouch) {
+TEST_F(TouchHudProjectionTest, DoubleTouch) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
   EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
@@ skipping 13 matching lines @@
   SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 2);
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 // Checks if turning off touch HUD projection while touching the screen is
 // handled correctly.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_DisableWhileTouching DISABLED_DisableWhileTouching
-#else
-#define MAYBE_DisableWhileTouching DisableWhileTouching
-#endif
-TEST_F(TouchHudProjectionTest, MAYBE_DisableWhileTouching) {
+TEST_F(TouchHudProjectionTest, DisableWhileTouching) {
   SetupSingleDisplay();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 
   EnableTouchHudProjection();
   EXPECT_NE(static_cast<TouchHudProjection*>(NULL),
             GetInternalTouchHudProjection());
   EXPECT_EQ(0, GetInternalTouchPointsCount());
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash