Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/animation/layer_animation_controller.h

 // Copyright 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.
 
 #ifndef CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 #define CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_
 
 #include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ skipping 161 matching lines @@
   void StartAnimations(base::TimeTicks monotonic_time);
   void PromoteStartedAnimations(base::TimeTicks monotonic_time,
                                 AnimationEventsVector* events);
   void MarkFinishedAnimations(base::TimeTicks monotonic_time);
   void MarkAnimationsForDeletion(base::TimeTicks monotonic_time,
                                  AnimationEventsVector* events);
   void PurgeAnimationsMarkedForDeletion();
 
   void TickAnimations(base::TimeTicks monotonic_time);
 
-  enum UpdateActivationType { NORMAL_ACTIVATION, FORCE_ACTIVATION };
+  enum UpdateActivationType {
+    NormalActivation,
+    ForceActivation
+  };
   void UpdateActivation(UpdateActivationType type);
 
   void NotifyObserversOpacityAnimated(float opacity,
                                       bool notify_active_observers,
                                       bool notify_pending_observers);
   void NotifyObserversTransformAnimated(const gfx::Transform& transform,
                                         bool notify_active_observers,
                                         bool notify_pending_observers);
   void NotifyObserversFilterAnimated(const FilterOperations& filter,
                                      bool notify_active_observers,
@@ skipping 29 matching lines @@
   bool needs_to_start_animations_;
 
   bool scroll_offset_animation_was_interrupted_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerAnimationController);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_LAYER_ANIMATION_CONTROLLER_H_