Revert 245031 "This CL"

ui/compositor/scoped_layer_animation_settings.h

Index: ui/compositor/scoped_layer_animation_settings.h
===================================================================
--- ui/compositor/scoped_layer_animation_settings.h	(revision 245869)
+++ ui/compositor/scoped_layer_animation_settings.h	(working copy)
@@ -34,6 +34,12 @@
   void SetTransitionDuration(base::TimeDelta duration);
   base::TimeDelta GetTransitionDuration() const;
 
+  // Locks transition duration in |animator_|. When transition duration
+  // is locked any subsequent changes to it are ignored until the
+  // ScopedLayerAnimationSettings object that has locked the duration goes out
+  // of scope.
+  void LockTransitionDuration();
+
   void SetTweenType(gfx::Tween::Type tween_type);
   gfx::Tween::Type GetTweenType() const;
 
@@ -50,6 +56,7 @@
 
  private:
   LayerAnimator* animator_;
+  bool old_is_transition_duration_locked_;
   base::TimeDelta old_transition_duration_;
   gfx::Tween::Type old_tween_type_;
   LayerAnimator::PreemptionStrategy old_preemption_strategy_;