Revert of Introduce NON_ZERO_DURATION for animation unit tests

ash/desktop_background/desktop_background_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/desktop_background/desktop_background_controller.h"
 
 #include <cmath>
 #include <cstdlib>
 
 #include "ash/ash_switches.h"
@@ skipping 50 matching lines @@
     layer->GetAnimator()->Step(step_time +
                                base::TimeDelta::FromMilliseconds(1000));
   }
 }
 
 }  // namespace
 
 class DesktopBackgroundControllerTest : public test::AshTestBase {
  public:
   DesktopBackgroundControllerTest()
-      : controller_(NULL),
-        wallpaper_delegate_(NULL) {
+      : controller_(NULL) {
   }
   virtual ~DesktopBackgroundControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     // Ash shell initialization creates wallpaper. Reset it so we can manually
     // control wallpaper creation and animation in our tests.
     RootWindowController* root_window_controller =
         Shell::GetPrimaryRootWindowController();
     root_window_controller->SetWallpaperController(NULL);
@@ skipping 60 matching lines @@
   EXPECT_TRUE(controller->MoveDesktopToUnlockedContainer());
   EXPECT_FALSE(controller->MoveDesktopToUnlockedContainer());
 
   // One window is moved from lock to desktop container.
   EXPECT_EQ(1, ChildCountForContainer(kDesktopBackgroundId));
   EXPECT_EQ(0, ChildCountForContainer(kLockScreenBackgroundId));
 }
 
 TEST_F(DesktopBackgroundControllerTest, ControllerOwnership) {
   // We cannot short-circuit animations for this test.
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   // Create wallpaper and background view.
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // The new wallpaper is ready to start animating. kAnimatingDesktopController
   // holds the widget controller instance. kDesktopController will get it later.
   RootWindowController* root_window_controller =
       Shell::GetPrimaryRootWindowController();
@@ skipping 10 matching lines @@
   // Ownership has moved from kAnimatingDesktopController to kDesktopController.
   EXPECT_FALSE(root_window_controller->animating_wallpaper_controller()->
                GetController(false));
   EXPECT_TRUE(root_window_controller->wallpaper_controller());
 }
 
 // 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) {
   // We cannot short-circuit animations for this test.
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   // Reset wallpaper state, see ControllerOwnership above.
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // Run wallpaper show animation to completion.
   RunDesktopControllerAnimation();
 
   // User locks the screen, which moves the background forward.
@@ skipping 26 matching lines @@
 
   // Now there is one desktop background, in the back.
   EXPECT_EQ(1, ChildCountForContainer(kDesktopBackgroundId));
   EXPECT_EQ(0, ChildCountForContainer(kLockScreenBackgroundId));
 }
 
 // Test for crbug.com/156542. Animating wallpaper should immediately finish
 // animation and replace current wallpaper before next animation starts.
 TEST_F(DesktopBackgroundControllerTest, ChangeWallpaperQuick) {
   // We cannot short-circuit animations for this test.
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   // Reset wallpaper state, see ControllerOwnership above.
   DesktopBackgroundController* controller =
       Shell::GetInstance()->desktop_background_controller();
   controller->CreateEmptyWallpaper();
 
   // Run wallpaper show animation to completion.
   RunDesktopControllerAnimation();
 
   // Change to a new wallpaper.
@@ skipping 97 matching lines @@
 
   // Maximum width and height belongs to different displays.
   UpdateDisplay("400x300,100x500");
   EXPECT_EQ(
       "400x500",
       DesktopBackgroundController::GetMaxDisplaySizeInNative().ToString());
 }
 
 
 }  // namespace ash