cros: Remove some OS platform ifdefs from ash

ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc

 // Copyright 2014 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/common/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/wm_shelf.h"
@@ skipping 75 matching lines @@
   }
 
   gfx::Rect GetWorkArea() { return alignment_delegate_->work_area_; }
 
  private:
   std::unique_ptr<AshPopupAlignmentDelegate> alignment_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AshPopupAlignmentDelegateTest);
 };
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_ShelfAlignment DISABLED_ShelfAlignment
-#else
-#define MAYBE_ShelfAlignment ShelfAlignment
-#endif
-TEST_F(AshPopupAlignmentDelegateTest, MAYBE_ShelfAlignment) {
+TEST_F(AshPopupAlignmentDelegateTest, ShelfAlignment) {
   const gfx::Rect toast_size(0, 0, 10, 10);
   UpdateDisplay("600x600");
   gfx::Point toast_point;
   toast_point.set_x(alignment_delegate()->GetToastOriginX(toast_size));
   toast_point.set_y(alignment_delegate()->GetBaseLine());
   EXPECT_EQ(BOTTOM_RIGHT, GetPositionInDisplay(toast_point));
   EXPECT_FALSE(alignment_delegate()->IsTopDown());
   EXPECT_FALSE(alignment_delegate()->IsFromLeft());
 
   GetPrimaryShelf()->SetAlignment(SHELF_ALIGNMENT_RIGHT);
@@ skipping 66 matching lines @@
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   shelf->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
 
   // Right-side dock should not affect popup alignment
   EXPECT_EQ(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
   EXPECT_FALSE(alignment_delegate()->IsTopDown());
   EXPECT_FALSE(alignment_delegate()->IsFromLeft());
 }
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_DisplayResize DISABLED_DisplayResize
-#else
-#define MAYBE_DisplayResize DisplayResize
-#endif
-TEST_F(AshPopupAlignmentDelegateTest, MAYBE_DisplayResize) {
+TEST_F(AshPopupAlignmentDelegateTest, DisplayResize) {
   const gfx::Rect toast_size(0, 0, 10, 10);
   UpdateDisplay("600x600");
   int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
   int baseline = alignment_delegate()->GetBaseLine();
 
   UpdateDisplay("800x800");
   EXPECT_LT(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_LT(baseline, alignment_delegate()->GetBaseLine());
 
   UpdateDisplay("400x400");
@@ skipping 70 matching lines @@
   UpdateDisplay("600x600,800x800");
   SetAlignmentDelegate(
       base::MakeUnique<AshPopupAlignmentDelegate>(GetPrimaryShelf()));
 
   EXPECT_GT(600,
             alignment_delegate()->GetToastOriginX(gfx::Rect(0, 0, 10, 10)));
 }
 
 // Tests that when the keyboard is showing that notifications appear above it,
 // and that they return to normal once the keyboard is gone.
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#define MAYBE_KeyboardShowing DISABLED_KeyboardShowing
-#else
-#define MAYBE_KeyboardShowing KeyboardShowing
-#endif
-TEST_F(AshPopupAlignmentDelegateTest, MAYBE_KeyboardShowing) {
+TEST_F(AshPopupAlignmentDelegateTest, KeyboardShowing) {
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
   ASSERT_TRUE(keyboard::IsKeyboardOverscrollEnabled());
 
   UpdateDisplay("600x600");
   int baseline = alignment_delegate()->GetBaseLine();
 
   WmShelf* shelf = GetPrimaryShelf();
   gfx::Rect keyboard_bounds(0, 300, 600, 300);
   shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash