Revert of Introduce NON_ZERO_DURATION for animation unit tests

ui/keyboard/keyboard_controller_unittest.cc

 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 453 matching lines @@
 }
 
 class KeyboardControllerAnimationTest : public KeyboardControllerTest,
                                         public KeyboardControllerObserver {
  public:
   KeyboardControllerAnimationTest() {}
   virtual ~KeyboardControllerAnimationTest() {}
 
   virtual void SetUp() OVERRIDE {
     // 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);
 
     KeyboardControllerTest::SetUp();
 
     const gfx::Rect& root_bounds = root_window()->bounds();
     keyboard_container()->SetBounds(root_bounds);
     root_window()->AddChild(keyboard_container());
     controller()->AddObserver(this);
   }
 
   virtual void TearDown() OVERRIDE {
@@ skipping 114 matching lines @@
   SetFocus(&input_client);
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   SetFocus(&no_input_client);
   // Keyboard should not hide itself after lost focus.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_FALSE(WillHideKeyboard());
 }
 
 }  // namespace keyboard