Remove unneeded ScopedLayerAnimationSettings::LockTransitionDuration()

ash/wm/window_animations.cc

Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 71d73f353c6f987d38246090a470a38b9b5a6b19..f7e720cc8d35f13adcdf9f1b2d9de1e3929a9c0d 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -137,8 +137,9 @@ void AnimateShowWindow_Minimize(aura::Window* window) {
   window->layer()->set_delegate(window);
   window->layer()->SetOpacity(kWindowAnimation_HideOpacity);
   ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
-  base::TimeDelta duration = base::TimeDelta::FromMilliseconds(
-      kLayerAnimationsForMinimizeDurationMS);
+  base::TimeDelta duration = views::corewm::GetWindowShowAnimationDuration(
+      window,
+      base::TimeDelta::FromMilliseconds(kLayerAnimationsForMinimizeDurationMS));
   settings.SetTransitionDuration(duration);
   AddLayerAnimationsForMinimize(window, true);
 
@@ -153,8 +154,9 @@ void AnimateHideWindow_Minimize(aura::Window* window) {
 
   // Property sets within this scope will be implicitly animated.
   ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
-  base::TimeDelta duration = base::TimeDelta::FromMilliseconds(
-      kLayerAnimationsForMinimizeDurationMS);
+  base::TimeDelta duration = views::corewm::GetWindowHideAnimationDuration(
+      window,
+      base::TimeDelta::FromMilliseconds(kLayerAnimationsForMinimizeDurationMS));
   settings.SetTransitionDuration(duration);
   settings.AddObserver(
       views::corewm::CreateHidingWindowAnimationObserver(window));
@@ -183,8 +185,11 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
     window->layer()->SetVisible(true);
   }
 
-  base::TimeDelta duration =
+  base::TimeDelta default_duration =
       base::TimeDelta::FromMilliseconds(kBrightnessGrayscaleFadeDurationMs);
+  base::TimeDelta duration = show ?
+      views::corewm::GetWindowShowAnimationDuration(window, default_duration) :
+      views::corewm::GetWindowHideAnimationDuration(window, default_duration);
 
   ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
   settings.SetTransitionDuration(duration);