| 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 077f495af1be9515a02d8a01694502f471bcabeb..7b23cc596d40fbe91f6287ca25de989e299804a4 100644
|
| --- a/ash/desktop_background/desktop_background_controller_unittest.cc
|
| +++ b/ash/desktop_background/desktop_background_controller_unittest.cc
|
| @@ -251,7 +251,14 @@ TEST_F(DesktopBackgroundControllerTest, ChangeWallpaperQuick) {
|
| EXPECT_EQ(animatingController, root->GetProperty(kDesktopController));
|
| }
|
|
|
| -TEST_F(DesktopBackgroundControllerTest, ResizeToFitScreens) {
|
| +#if defined(OS_WIN)
|
| +// Broken on win8_aura. http://crbug.com/179763
|
| +# define MAYBE_ResizeToFitScreens DISABLED_ResizeToFitScreens
|
| +#else
|
| +# define MAYBE_ResizeToFitScreens ResizeToFitScreens
|
| +#endif
|
| +
|
| +TEST_F(DesktopBackgroundControllerTest, MAYBE_ResizeToFitScreens) {
|
| // We cannot short-circuit animations for this test.
|
| ui::LayerAnimator::set_disable_animations_for_test(false);
|
|
|
|
|