| Index: ash/desktop_background/desktop_background_controller_unittest.cc
|
| diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc
|
| index e48142639d71ccf1382f882c8dc88ccaad6b05e3..4e87be651bf4085add29592097448eb2b7823603 100644
|
| --- a/ash/desktop_background/desktop_background_controller_unittest.cc
|
| +++ b/ash/desktop_background/desktop_background_controller_unittest.cc
|
| @@ -108,6 +108,7 @@ class DesktopBackgroundControllerTest : public test::AshTestBase {
|
| Shell::GetPrimaryRootWindowController()
|
| ->animating_wallpaper_controller()
|
| ->GetController(false);
|
| + EXPECT_TRUE(!!controller);
|
| ASSERT_NO_FATAL_FAILURE(RunAnimationForWidget(controller->widget()));
|
| }
|
|
|
| @@ -179,8 +180,7 @@ 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.
|
| -// Disabled for crbug.com/366993
|
| -TEST_F(DesktopBackgroundControllerTest, DISABLED_BackgroundMovementDuringUnlock) {
|
| +TEST_F(DesktopBackgroundControllerTest, BackgroundMovementDuringUnlock) {
|
| // We cannot short-circuit animations for this test.
|
| ui::ScopedAnimationDurationScaleMode normal_duration_mode(
|
| ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
|
|
|