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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2244243003: Renable ShutdownHandlesWindowActivation on non-Windows platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index b94d7c3819c5e265b12ff7f10507f1a222ea85dc..13d445f0da448cd2aa6348a303fc60d93cf6e6a8 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -1902,9 +1902,17 @@ TEST_F(ShelfLayoutManagerTest,
EXPECT_EQ(initial_bounds, reshow_target_bounds);
}
+// Flaky crash on Windows (crbug.com/637873).
+#if defined(OS_WIN)
+#define MAYBE_ShutdownHandlesWindowActivation \
+ DISABLED_ShutdownHandlesWindowActivation
+#else
+#define MAYBE_ShutdownHandlesWindowActivation ShutdownHandlesWindowActivation
+#endif
+
// Tests that during shutdown, that window activation changes are properly
// handled, and do not crash (crbug.com/458768)
-TEST_F(ShelfLayoutManagerTest, DISABLED_ShutdownHandlesWindowActivation) {
+TEST_F(ShelfLayoutManagerTest, MAYBE_ShutdownHandlesWindowActivation) {
GetShelf()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
aura::Window* window1 = CreateTestWindowInShellWithId(0);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698