1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/ui/compositor/scoped_layer_animation_settings.cc b/chromium/ui/compositor/scoped_layer_animation_settings.cc
index 84456ee5bc1..487f96afe69 100644
--- a/chromium/ui/compositor/scoped_layer_animation_settings.cc
+++ b/chromium/ui/compositor/scoped_layer_animation_settings.cc
@@ -61,10 +61,10 @@ class InvertingObserver : public ImplicitAnimationObserver {
         "Inverse supported only for single element sequences.";
 
       LayerAnimationElement* element = sequence->FirstElement();
-      LayerAnimationElement::AnimatableProperties transform_property;
-      transform_property.insert(LayerAnimationElement::TRANSFORM);
-      DCHECK(transform_property == element->properties())
-        << "Only transform animations are currently invertible.";
+      DCHECK_EQ(static_cast<LayerAnimationElement::AnimatableProperties>(
+                    LayerAnimationElement::TRANSFORM),
+                element->properties())
+          << "Only transform animations are currently invertible.";
 
       scoped_ptr<LayerAnimationElement> to_return(
           LayerAnimationElement::CreateInverseTransformElement(base, element));
@@ -77,9 +77,9 @@ class InvertingObserver : public ImplicitAnimationObserver {
 };
 
 
-// ScoperLayerAnimationSettings ------------------------------------------------
+// ScopedLayerAnimationSettings ------------------------------------------------
 ScopedLayerAnimationSettings::ScopedLayerAnimationSettings(
-    LayerAnimator* animator)
+    scoped_refptr<LayerAnimator> animator)
     : animator_(animator),
       old_is_transition_duration_locked_(
           animator->is_transition_duration_locked_),