Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2723)

Unified Diff: ash/desktop_background/desktop_background_controller_unittest.cc

Issue 12374075: Disable DesktopBackgroundControllerTest.ResizeToFitScreens on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698