| Index: ui/keyboard/keyboard_controller_unittest.cc
|
| diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc
|
| index 9a6856131fc83e339e2045e34ff403110d22c166..7f97a5f3d2b90651b78c481057a0aa85770c2f52 100644
|
| --- a/ui/keyboard/keyboard_controller_unittest.cc
|
| +++ b/ui/keyboard/keyboard_controller_unittest.cc
|
| @@ -471,8 +471,8 @@
|
|
|
| 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();
|
|
|
|
|