Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1947)

Unified Diff: ash/wm/screen_dimmer_unittest.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/screen_dimmer_unittest.cc
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc
index 53266525d8646ad61ddd29539a226085bd46e18b..a1da7c610b279e2fe4754502484104024d43f05c 100644
--- a/ash/wm/screen_dimmer_unittest.cc
+++ b/ash/wm/screen_dimmer_unittest.cc
@@ -75,13 +75,7 @@ TEST_F(ScreenDimmerTest, DimAndUndim) {
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();
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698