summaryrefslogtreecommitdiffstats
path: root/ash/display/display_controller_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/display/display_controller_unittest.cc')
-rw-r--r--ash/display/display_controller_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 0ff6283..f0956ee 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -104,7 +104,8 @@ TEST_F(DisplayControllerShutdownTest, MAYBE_Shutdown) {
UpdateDisplay("444x333, 200x200");
}
-TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
+// Flaky - crbug.com/161857
+TEST_F(DisplayControllerTest, DISABLED_SecondaryDisplayLayout) {
TestObserver observer;
UpdateDisplay("500x500,400x400");
EXPECT_EQ(2, observer.CountAndReset()); // resize and add