cros: Remove some OS platform ifdefs from ash

ash/wm/screen_dimmer_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/common/wm/screen_dimmer.h"
 
 #include <memory>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_dimmer.h"
@@ skipping 57 matching lines @@
   ASSERT_TRUE(!root_layer->children().empty());
   EXPECT_EQ(GetDimWindowLayer(), root_layer->children().back());
   EXPECT_TRUE(GetDimWindowLayer()->visible());
   EXPECT_GT(GetDimWindowLayer()->GetTargetOpacity(), 0.0f);
 
   // When we disable dimming, the layer should be removed.
   dimmer_->SetDimming(false);
   ASSERT_EQ(nullptr, GetDimWindowLayer());
 }
 
-#if defined(OS_WIN) && !defined(USE_ASH)
-// TODO(msw): Times out on Windows. http://crbug.com/584038
-#define MAYBE_ResizeLayer DISABLED_ResizeLayer
-#else
-#define MAYBE_ResizeLayer ResizeLayer
-#endif
-TEST_F(ScreenDimmerTest, MAYBE_ResizeLayer) {
+TEST_F(ScreenDimmerTest, ResizeLayer) {
   // The dimming layer should be initially sized to cover the root window.
   dimmer_->SetDimming(true);
   ui::Layer* dimming_layer = GetDimWindowLayer();
   ASSERT_TRUE(dimming_layer != nullptr);
   ui::Layer* root_layer = Shell::GetPrimaryRootWindow()->layer();
   EXPECT_EQ(gfx::Rect(root_layer->bounds().size()).ToString(),
             dimming_layer->bounds().ToString());
 
   // When we resize the root window, the dimming layer should be resized to
   // match.
@@ skipping 42 matching lines @@
 };
 
 // This test verifies ScreenDimmer can be destroyed after the shell. The
 // interesting part of this test is in TearDown(), which creates a ScreenDimmer
 // that is deleted after WmShell.
 TEST_F(ScreenDimmerShellDestructionTest, DontCrashIfScreenDimmerOutlivesShell) {
 }
 
 }  // namespace test
 }  // namespace ash