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

cc/CCLayerAnimationController.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 CCLayerAnimationController_h
 #define CCLayerAnimationController_h
 
 #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;
 }
 
 namespace cc {
 
 class Animation;
 class IntSize;
 class KeyframeValueList;
 
 class CCLayerAnimationControllerClient {
 public:
     virtual ~CCLayerAnimationControllerClient() { }
 
     virtual int id() const = 0;
     virtual void setOpacityFromAnimation(float) = 0;
     virtual float opacity() const = 0;
     virtual void setTransformFromAnimation(const WebKit::WebTransformationMatrix&) = 0;
     virtual const WebKit::WebTransformationMatrix& transform() const = 0;
 };
 
 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);
     virtual void suspendAnimations(double monotonicTime);
     virtual void resumeAnimations(double monotonicTime);
 
     // Ensures that the list of active animations on the main thread and the impl thread
     // are kept in sync. This function does not take ownership of the impl thread controller.
     virtual void pushAnimationUpdatesTo(CCLayerAnimationController*);
 
@@ skipping 41 matching lines @@
     void resolveConflicts(double monotonicTime);
     void markAnimationsForDeletion(double monotonicTime, CCAnimationEventsVector*);
     void purgeAnimationsMarkedForDeletion();
 
     void tickAnimations(double monotonicTime);
 
     // If this is true, we force a sync to the impl thread.
     bool m_forceSync;
 
     CCLayerAnimationControllerClient* m_client;
-    ScopedPtrVector<CCActiveAnimation> m_activeAnimations;
+    OwnPtrVector<CCActiveAnimation> m_activeAnimations;
 
     DISALLOW_COPY_AND_ASSIGN(CCLayerAnimationController);
 };
 
 } // namespace cc
 
 #endif // CCLayerAnimationController_h