reland -- Disable animations during aura tests.

ui/gfx/compositor/scoped_layer_animation_settings.cc

Index: ui/gfx/compositor/scoped_layer_animation_settings.cc
diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.cc b/ui/gfx/compositor/scoped_layer_animation_settings.cc
index 874b92751ee6524fcd4e18a33172c99c6e4f6612..7a7dbc14aab28a9175d3eac679b61ebbae5c8539 100644
--- a/ui/gfx/compositor/scoped_layer_animation_settings.cc
+++ b/ui/gfx/compositor/scoped_layer_animation_settings.cc
@@ -26,27 +26,19 @@ ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
 ScopedLayerAnimationSettings::~ScopedLayerAnimationSettings() {
   animator_->transition_duration_ = old_transition_duration_;
 
-  for (std::set<LayerAnimationObserver*>::const_iterator i =
-       observers_.begin(); i != observers_.end(); ++i)
-      animator_->observers_.RemoveObserver(*i);
-
   for (std::set<ImplicitAnimationObserver*>::const_iterator i =
-       implicit_observers_.begin(); i != implicit_observers_.end(); ++i)
-      (*i)->SetActive(true);
+       observers_.begin(); i != observers_.end(); ++i) {
+    animator_->observers_.RemoveObserver(*i);
+    (*i)->SetActive(true);
+  }
 }
 
 void ScopedLayerAnimationSettings::AddObserver(
-    LayerAnimationObserver* observer) {
+    ImplicitAnimationObserver* observer) {
   observers_.insert(observer);
   animator_->AddObserver(observer);
 }
 
-void ScopedLayerAnimationSettings::AddImplicitObserver(
-    ImplicitAnimationObserver* observer) {
-  implicit_observers_.insert(observer);
-  AddObserver(observer);
-}
-
 void ScopedLayerAnimationSettings::SetTransitionDuration(
     base::TimeDelta duration) {
   animator_->transition_duration_ = duration;