Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCLayerTreeHostTest.cpp

Index: cc/CCLayerTreeHostTest.cpp
===================================================================
--- cc/CCLayerTreeHostTest.cpp	(revision 160631)
+++ cc/CCLayerTreeHostTest.cpp	(working copy)
@@ -2428,7 +2428,7 @@
     virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
     virtual bool drawsContent() const OVERRIDE { return true; }
 
-    virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
+    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
     virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
     virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
 
@@ -2456,9 +2456,9 @@
 
 class EvictionTestLayerImpl : public CCLayerImpl {
 public:
-    static scoped_ptr<EvictionTestLayerImpl> create(int id)
+    static PassOwnPtr<EvictionTestLayerImpl> create(int id)
     {
-        return make_scoped_ptr(new EvictionTestLayerImpl(id));
+        return adoptPtr(new EvictionTestLayerImpl(id));
     }
     virtual ~EvictionTestLayerImpl() { }
 
@@ -2496,9 +2496,9 @@
     queue.appendFullUpload(parameters);
 }
 
-scoped_ptr<CCLayerImpl> EvictionTestLayer::createCCLayerImpl()
+PassOwnPtr<CCLayerImpl> EvictionTestLayer::createCCLayerImpl()
 {
-    return EvictionTestLayerImpl::create(m_layerId).PassAs<CCLayerImpl>();
+    return EvictionTestLayerImpl::create(m_layerId);
 }
 
 void EvictionTestLayer::pushPropertiesTo(CCLayerImpl* layerImpl)