Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCLayerImpl.h

Index: cc/CCLayerImpl.h
===================================================================
--- cc/CCLayerImpl.h	(revision 160631)
+++ cc/CCLayerImpl.h	(working copy)
@@ -5,7 +5,6 @@
 #ifndef CCLayerImpl_h
 #define CCLayerImpl_h
 
-#include "base/memory/scoped_ptr.h"
 #include "CCInputHandler.h"
 #include "CCLayerAnimationController.h"
 #include "CCRenderPass.h"
@@ -16,11 +15,13 @@
 #include "IntRect.h"
 #include "Region.h"
 #include "SkColor.h"
-#include "cc/scoped_ptr_vector.h"
+#include "cc/own_ptr_vector.h"
 #include <public/WebFilterOperations.h>
 #include <public/WebTransformationMatrix.h>
 #include <string>
 #include <wtf/OwnPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
 
 namespace cc {
 
@@ -36,9 +37,9 @@
 
 class CCLayerImpl : public CCLayerAnimationControllerClient {
 public:
-    static scoped_ptr<CCLayerImpl> create(int id)
+    static PassOwnPtr<CCLayerImpl> create(int id)
     {
-        return make_scoped_ptr(new CCLayerImpl(id));
+        return adoptPtr(new CCLayerImpl(id));
     }
 
     virtual ~CCLayerImpl();
@@ -52,15 +53,15 @@
 
     // Tree structure.
     CCLayerImpl* parent() const { return m_parent; }
-    const ScopedPtrVector<CCLayerImpl>& children() const { return m_children; }
-    void addChild(scoped_ptr<CCLayerImpl>);
+    const OwnPtrVector<CCLayerImpl>& children() const { return m_children; }
+    void addChild(PassOwnPtr<CCLayerImpl>);
     void removeFromParent();
     void removeAllChildren();
 
-    void setMaskLayer(scoped_ptr<CCLayerImpl>);
+    void setMaskLayer(PassOwnPtr<CCLayerImpl>);
     CCLayerImpl* maskLayer() const { return m_maskLayer.get(); }
 
-    void setReplicaLayer(scoped_ptr<CCLayerImpl>);
+    void setReplicaLayer(PassOwnPtr<CCLayerImpl>);
     CCLayerImpl* replicaLayer() const { return m_replicaLayer.get(); }
 
     bool hasMask() const { return m_maskLayer; }
@@ -282,12 +283,12 @@
 
     // Properties internal to CCLayerImpl
     CCLayerImpl* m_parent;
-    ScopedPtrVector<CCLayerImpl> m_children;
+    OwnPtrVector<CCLayerImpl> m_children;
     // m_maskLayer can be temporarily stolen during tree sync, we need this ID to confirm newly assigned layer is still the previous one
     int m_maskLayerId;
-    scoped_ptr<CCLayerImpl> m_maskLayer;
+    OwnPtr<CCLayerImpl> m_maskLayer;
     int m_replicaLayerId; // ditto
-    scoped_ptr<CCLayerImpl> m_replicaLayer;
+    OwnPtr<CCLayerImpl> m_replicaLayer;
     int m_layerId;
     CCLayerTreeHostImpl* m_layerTreeHostImpl;