Revert of Introduce NON_ZERO_DURATION for animation unit tests

ash/wm/window_animations_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/wm/window_animations.h"
 
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/workspace_controller.h"
@@ skipping 47 matching lines @@
       ui::LayerAnimationSequence* sequence) OVERRIDE {}
 
  private:
   ui::LayerAnimator* animator_;
   base::TimeDelta duration_;
 
   DISALLOW_COPY_AND_ASSIGN(MinimizeAnimationObserver);
 };
 
 TEST_F(WindowAnimationsTest, HideShowBrightnessGrayscaleAnimation) {
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
-
   scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
   window->Show();
   EXPECT_TRUE(window->layer()->visible());
 
   // Hiding.
   ::wm::SetWindowVisibilityAnimationType(
       window.get(),
       WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE);
   AnimateOnChildWindowVisibilityChanged(window.get(), false);
   EXPECT_EQ(0.0f, window->layer()->GetTargetOpacity());
@@ skipping 25 matching lines @@
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
   window->Hide();
   EXPECT_FALSE(window->layer()->GetTargetVisibility());
   window->Show();
   EXPECT_TRUE(window->layer()->GetTargetVisibility());
 }
 
 namespace wm {
 
 TEST_F(WindowAnimationsTest, CrossFadeToBounds) {
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   window->SetBounds(gfx::Rect(5, 10, 320, 240));
   window->Show();
 
   Layer* old_layer = window->layer();
   EXPECT_EQ(1.0f, old_layer->GetTargetOpacity());
 
   // Cross fade to a larger size, as in a maximize animation.
   GetWindowState(window.get())->SetBoundsDirectCrossFade(
@@ skipping 36 matching lines @@
 
   old_layer->GetAnimator()->Step(base::TimeTicks::Now() +
                                  base::TimeDelta::FromSeconds(1));
   window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
                                        base::TimeDelta::FromSeconds(1));
 }
 
 }  // namespace wm
 
 TEST_F(WindowAnimationsTest, LockAnimationDuration) {
-  ui::ScopedAnimationDurationScaleMode test_duration_mode(
-      ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);
+  ui::ScopedAnimationDurationScaleMode normal_duration_mode(
+      ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> window(CreateTestWindowInShellWithId(0));
   Layer* layer = window->layer();
   window->SetBounds(gfx::Rect(5, 10, 320, 240));
   window->Show();
 
   // Test that it is possible to override transition duration when it is not
   // locked.
   {
     ui::ScopedLayerAnimationSettings settings1(layer->GetAnimator());
@@ skipping 54 matching lines @@
     EXPECT_TRUE(layer->GetAnimator()->is_animating());
     // Expect default duration (200ms for stock ash minimizing animation).
     EXPECT_EQ(default_duration.InMilliseconds(),
               layer->GetAnimator()->GetTransitionDuration().InMilliseconds());
     window->Show();
     layer->GetAnimator()->StopAnimating();
   }
 }
 
 }  // namespace ash