Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/CCDelegatedRendererLayerImplTest.cpp

Index: cc/CCDelegatedRendererLayerImplTest.cpp
===================================================================
--- cc/CCDelegatedRendererLayerImplTest.cpp	(revision 160631)
+++ cc/CCDelegatedRendererLayerImplTest.cpp	(working copy)
@@ -99,10 +99,10 @@
     CCDelegatedRendererLayerImplTestSimple()
         : CCDelegatedRendererLayerImplTest()
     {
-        scoped_ptr<CCLayerImpl> rootLayer = CCSolidColorLayerImpl::create(1).PassAs<CCLayerImpl>();
-        scoped_ptr<CCLayerImpl> layerBefore = CCSolidColorLayerImpl::create(2).PassAs<CCLayerImpl>();
-        scoped_ptr<CCLayerImpl> layerAfter = CCSolidColorLayerImpl::create(3).PassAs<CCLayerImpl>();
-        scoped_ptr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(4);
+        OwnPtr<CCSolidColorLayerImpl> rootLayer = CCSolidColorLayerImpl::create(1);
+        OwnPtr<CCSolidColorLayerImpl> layerBefore = CCSolidColorLayerImpl::create(2);
+        OwnPtr<CCSolidColorLayerImpl> layerAfter = CCSolidColorLayerImpl::create(3);
+        OwnPtr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(4);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
@@ -146,19 +146,19 @@
         m_delegatedRendererLayerPtr = delegatedRendererLayer.get();
 
         // Force the delegated RenderPasses to come before the RenderPass from layerAfter.
-        layerAfter->addChild(delegatedRendererLayer.PassAs<CCLayerImpl>());
-        rootLayer->addChild(layerAfter.Pass());
+        layerAfter->addChild(delegatedRendererLayer.release());
+        rootLayer->addChild(layerAfter.release());
 
         // Get the RenderPass generated by layerBefore to come before the delegated RenderPasses.
-        rootLayer->addChild(layerBefore.Pass());
+        rootLayer->addChild(layerBefore.release());
 
-        m_hostImpl->setRootLayer(rootLayer.Pass());
+        m_hostImpl->setRootLayer(rootLayer.release());
     }
 
 protected:
-    CCLayerImpl* m_rootLayerPtr;
-    CCLayerImpl* m_layerBeforePtr;
-    CCLayerImpl* m_layerAfterPtr;
+    CCSolidColorLayerImpl* m_rootLayerPtr;
+    CCSolidColorLayerImpl* m_layerBeforePtr;
+    CCSolidColorLayerImpl* m_layerAfterPtr;
     CCDelegatedRendererLayerImpl* m_delegatedRendererLayerPtr;
 };
 
@@ -382,8 +382,8 @@
     CCDelegatedRendererLayerImplTestSharedData()
         : CCDelegatedRendererLayerImplTest()
     {
-        scoped_ptr<CCLayerImpl> rootLayer = CCLayerImpl::create(1);
-        scoped_ptr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(2);
+        OwnPtr<CCLayerImpl> rootLayer = CCLayerImpl::create(1);
+        OwnPtr<CCDelegatedRendererLayerImpl> delegatedRendererLayer = CCDelegatedRendererLayerImpl::create(2);
 
         m_hostImpl->setViewportSize(IntSize(100, 100), IntSize(100, 100));
         rootLayer->setBounds(IntSize(100, 100));
@@ -414,9 +414,9 @@
         m_rootLayerPtr = rootLayer.get();
         m_delegatedRendererLayerPtr = delegatedRendererLayer.get();
 
-        rootLayer->addChild(delegatedRendererLayer.PassAs<CCLayerImpl>());
+        rootLayer->addChild(delegatedRendererLayer.release());
 
-        m_hostImpl->setRootLayer(rootLayer.Pass());
+        m_hostImpl->setRootLayer(rootLayer.release());
     }
 
 protected: