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

cc/CCLayerAnimationController.h

Index: cc/CCLayerAnimationController.h
===================================================================
--- cc/CCLayerAnimationController.h	(revision 161134)
+++ cc/CCLayerAnimationController.h	(working copy)
@@ -8,9 +8,10 @@
 #include "CCAnimationEvents.h"
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
-#include "cc/scoped_ptr_vector.h"
+#include "cc/own_ptr_vector.h"
 #include <wtf/HashSet.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
 class WebTransformationMatrix;
@@ -35,12 +36,12 @@
 
 class CCLayerAnimationController {
 public:
-    static scoped_ptr<CCLayerAnimationController> create(CCLayerAnimationControllerClient*);
+    static PassOwnPtr<CCLayerAnimationController> create(CCLayerAnimationControllerClient*);
 
     virtual ~CCLayerAnimationController();
 
     // These methods are virtual for testing.
-    virtual void addAnimation(scoped_ptr<CCActiveAnimation>);
+    virtual void addAnimation(PassOwnPtr<CCActiveAnimation>);
     virtual void pauseAnimation(int animationId, double timeOffset);
     virtual void removeAnimation(int animationId);
     virtual void removeAnimation(int animationId, CCActiveAnimation::TargetProperty);
@@ -102,7 +103,7 @@
     bool m_forceSync;
 
     CCLayerAnimationControllerClient* m_client;
-    ScopedPtrVector<CCActiveAnimation> m_activeAnimations;
+    OwnPtrVector<CCActiveAnimation> m_activeAnimations;
 
     DISALLOW_COPY_AND_ASSIGN(CCLayerAnimationController);
 };