summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 04:49:26 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-25 04:49:26 +0000
commite2233e6ebad14915b2b2b75a4f7c1aa4660d7de2 (patch)
treeab38b6234360ce9c815dad596f306c8eab119c65
parent6af4ef827c3ec31495edcc01c0e18a206e74fbe8 (diff)
downloadchromium_src-e2233e6ebad14915b2b2b75a4f7c1aa4660d7de2.zip
chromium_src-e2233e6ebad14915b2b2b75a4f7c1aa4660d7de2.tar.gz
chromium_src-e2233e6ebad14915b2b2b75a4f7c1aa4660d7de2.tar.bz2
Disable DesktopBackgroundControllerTest.BackgroundMovementDuringUnlock
BUG=366993 NOTRY=true Review URL: https://codereview.chromium.org/256693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266131 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/desktop_background/desktop_background_controller_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc
index 53a90eb..e481426 100644
--- a/ash/desktop_background/desktop_background_controller_unittest.cc
+++ b/ash/desktop_background/desktop_background_controller_unittest.cc
@@ -179,7 +179,8 @@ TEST_F(DesktopBackgroundControllerTest, ControllerOwnership) {
// Test for crbug.com/149043 "Unlock screen, no launcher appears". Ensure we
// move all desktop views if there are more than one.
-TEST_F(DesktopBackgroundControllerTest, BackgroundMovementDuringUnlock) {
+// Disabled for crbug.com/366993
+TEST_F(DesktopBackgroundControllerTest, DISABLED_BackgroundMovementDuringUnlock) {
// We cannot short-circuit animations for this test.
ui::ScopedAnimationDurationScaleMode normal_duration_mode(
ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);