diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 05:20:34 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 05:20:34 +0000 |
| commit | 96db249a089bb2b12dd22c3d83b9cc29855e46c1 (patch) | |
| tree | b303e7664a515d0d45ca9b3a04499cf99adc7435 /ash/desktop_background | |
| parent | 3308fba1a6ce406c51167dbe03083860c4a1d2f4 (diff) | |
| download | chromium_src-96db249a089bb2b12dd22c3d83b9cc29855e46c1.zip chromium_src-96db249a089bb2b12dd22c3d83b9cc29855e46c1.tar.gz chromium_src-96db249a089bb2b12dd22c3d83b9cc29855e46c1.tar.bz2 | |
Disable DesktopBackgroundControllerTest.ResizeToFitScreens on Windows
BUG=179763
TEST=DesktopBackgroundControllerTest.ResizeToFitScreens
TBR=bshe
Review URL: https://codereview.chromium.org/12374075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc index 077f495..7b23cc5 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); |