Revert of Introduce NON_ZERO_DURATION for animation unit tests (https://codereview.chromium.org/420013002/)

Reason for revert:
I suspect this is causing Linux Tests dbg (2) failures in app_list_unittests:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/47929

Strangely I had green try runs for linux_chromium_rel for app_list_unittests.


Original issue's description:
> Introduce NON_ZERO_DURATION for animation unit tests
> 
> Animations are usually disabled in unit tests for performance. However, to
> test the animation system itself some tests request "normal" durations.
> Under some conditions (remote desktop, animation disabled for accessibility)
> the "normal" duration could still be zero.
> 
> This was causing test failures and use-after-frees in ash_unittests on the
> drmemory bots and for developers using remote desktop.
> 
> Introduce NON_ZERO_DURATION to signal that animation must be enabled and the
> duration must be non-zero, but other than that can be as short as possible.
> 
> BUG=397478,396969
> TEST=ash_unittests on drmemory, Windows and Chrome OS bots
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286089

TBR=oshima@chromium.org,ajuma@chromium.org,sky@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=397478,396969

Review URL: https://codereview.chromium.org/413403011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286102 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/ash/desktop_background/desktop_background_controller_unittest.cc b/ash/desktop_background/desktop_background_controller_unittest.cc
index 8751a18..fa2e2a4 100644
--- a/ash/desktop_background/desktop_background_controller_unittest.cc
+++ b/ash/desktop_background/desktop_background_controller_unittest.cc
@@ -68,8 +68,7 @@ void RunAnimationForWidget(views::Widget* widget) {
 class DesktopBackgroundControllerTest : public test::AshTestBase {
  public:
   DesktopBackgroundControllerTest()
-      : controller_(NULL),
-        wallpaper_delegate_(NULL) {
+      : controller_(NULL) {
   }
   virtual ~DesktopBackgroundControllerTest() {}
 
@@ -150,8 +149,8 @@ TEST_F(DesktopBackgroundControllerTest, BasicReparenting) {
 
 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 =
@@ -182,8 +181,8 @@ TEST_F(DesktopBackgroundControllerTest, ControllerOwnership) {
 // 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 =
@@ -230,8 +229,8 @@ TEST_F(DesktopBackgroundControllerTest, BackgroundMovementDuringUnlock) {
 // 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 =