Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes

cc/CCActiveAnimation.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 CCActiveAnimation_h
 #define CCActiveAnimation_h
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 namespace cc {
 
 class CCAnimationCurve;
 
 // A CCActiveAnimation, contains all the state required to play a CCAnimationCurve.
 // Specifically, the affected property, the run state (paused, finished, etc.),
 // loop count, last pause time, and the total time spent paused.
 class CCActiveAnimation {
 public:
@@ skipping 19 matching lines @@
         RunStateEnumSize
     };
 
     enum TargetProperty {
         Transform = 0,
         Opacity,
         // This sentinel must be last.
         TargetPropertyEnumSize
     };
 
-    static scoped_ptr<CCActiveAnimation> create(scoped_ptr<CCAnimationCurve>, int animationId, int groupId, TargetProperty);
+    static PassOwnPtr<CCActiveAnimation> create(PassOwnPtr<CCAnimationCurve>, int animationId, int groupId, TargetProperty);
 
     virtual ~CCActiveAnimation();
 
     int id() const { return m_id; }
     int group() const { return m_group; }
     TargetProperty targetProperty() const { return m_targetProperty; }
 
     RunState runState() const { return m_runState; }
     void setRunState(RunState, double monotonicTime);
 
@@ skipping 32 matching lines @@
 
     // Takes the given absolute time, and using the start time and the number
     // of iterations, returns the relative time in the current iteration.
     double trimTimeToCurrentIteration(double monotonicTime) const;
 
     enum InstanceType {
         ControllingInstance = 0,
         NonControllingInstance
     };
 
-    scoped_ptr<CCActiveAnimation> clone(InstanceType) const;
-    scoped_ptr<CCActiveAnimation> cloneAndInitialize(InstanceType, RunState initialRunState, double startTime) const;
+    PassOwnPtr<CCActiveAnimation> clone(InstanceType) const;
+    PassOwnPtr<CCActiveAnimation> cloneAndInitialize(InstanceType, RunState initialRunState, double startTime) const;
     bool isControllingInstance() const { return m_isControllingInstance; }
 
     void pushPropertiesTo(CCActiveAnimation*) const;
 
 private:
-    CCActiveAnimation(scoped_ptr<CCAnimationCurve>, int animationId, int groupId, TargetProperty);
+    CCActiveAnimation(PassOwnPtr<CCAnimationCurve>, int animationId, int groupId, TargetProperty);
 
-    scoped_ptr<CCAnimationCurve> m_curve;
+    OwnPtr<CCAnimationCurve> m_curve;
 
     // IDs are not necessarily unique.
     int m_id;
 
     // Animations that must be run together are called 'grouped' and have the same group id
     // Grouped animations are guaranteed to start at the same time and no other animations
     // may animate any of the group's target properties until all animations in the
     // group have finished animating. Note: an active animation's group id and target
     // property uniquely identify that animation.
     int m_group;
@@ skipping 30 matching lines @@
     // that ultimately controls the values of the animating layer and so we will refer
     // to it as the 'controlling instance'.
     bool m_isControllingInstance;
 
     DISALLOW_COPY_AND_ASSIGN(CCActiveAnimation);
 };
 
 } // namespace cc
 
 #endif // CCActiveAnimation_h