Remove unneeded ScopedLayerAnimationSettings::LockTransitionDuration()

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 149 matching lines @@
   // New layer animates in to the identity transform.
   EXPECT_EQ(1.0f, window->layer()->GetTargetOpacity());
   EXPECT_EQ(gfx::Transform(), window->layer()->GetTargetTransform());
 
   static_cast<gfx::AnimationContainerElement*>(old_layer->GetAnimator())->Step(
       base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
   static_cast<gfx::AnimationContainerElement*>(window->layer()->GetAnimator())->
       Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
 }
 
-TEST_F(WindowAnimationsTest, LockAnimationDuration) {
-  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());
-    settings1.SetTransitionDuration(base::TimeDelta::FromMilliseconds(1000));
-    {
-      ui::ScopedLayerAnimationSettings settings2(layer->GetAnimator());
-      // Duration is not locked so it gets overridden.
-      settings2.SetTransitionDuration(base::TimeDelta::FromMilliseconds(50));
-      wm::GetWindowState(window.get())->Minimize();
-      EXPECT_TRUE(layer->GetAnimator()->is_animating());
-      // Expect duration from the inner scope
-      EXPECT_EQ(50,
-                layer->GetAnimator()->GetTransitionDuration().InMilliseconds());
-    }
-    window->Show();
-    layer->GetAnimator()->StopAnimating();
-  }
-
-  // Test that it is possible to lock transition duration
-  {
-    ui::ScopedLayerAnimationSettings settings1(layer->GetAnimator());
-    settings1.SetTransitionDuration(base::TimeDelta::FromMilliseconds(1000));
-    // Duration is locked in outer scope.
-    settings1.LockTransitionDuration();
-    {
-      ui::ScopedLayerAnimationSettings settings2(layer->GetAnimator());
-      // Transition duration setting is ignored.
-      settings2.SetTransitionDuration(base::TimeDelta::FromMilliseconds(50));
-      wm::GetWindowState(window.get())->Minimize();
-      EXPECT_TRUE(layer->GetAnimator()->is_animating());
-      // Expect duration from the outer scope
-      EXPECT_EQ(1000,
-                layer->GetAnimator()->GetTransitionDuration().InMilliseconds());
-    }
-    window->Show();
-    layer->GetAnimator()->StopAnimating();
-  }
-
-  // Test that duration respects default.
-  {
-    // Query default duration.
-    MinimizeAnimationObserver observer(layer->GetAnimator());
-    wm::GetWindowState(window.get())->Minimize();
-    EXPECT_TRUE(layer->GetAnimator()->is_animating());
-    base::TimeDelta default_duration(observer.duration());
-    window->Show();
-    layer->GetAnimator()->StopAnimating();
-
-    ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
-    settings.LockTransitionDuration();
-    // Setting transition duration is ignored since duration is locked
-    settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(1000));
-    wm::GetWindowState(window.get())->Minimize();
-    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 internal
 }  // namespace ash