Revert 160631 - [cc] Store CCLayerImpls as scoped_ptrs

cc/ScrollbarLayerChromiumTest.cpp

Index: cc/ScrollbarLayerChromiumTest.cpp
===================================================================
--- cc/ScrollbarLayerChromiumTest.cpp	(revision 160631)
+++ cc/ScrollbarLayerChromiumTest.cpp	(working copy)
@@ -57,7 +57,7 @@
         layerTreeRoot->addChild(child1);
         layerTreeRoot->addChild(child2);
 
-        scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
+        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
 
         CCLayerImpl* ccChild1 = ccLayerTreeRoot->children()[0];
         CCScrollbarLayerImpl* ccChild2 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1]);
@@ -74,7 +74,7 @@
         layerTreeRoot->addChild(child1);
         layerTreeRoot->addChild(child2);
 
-        scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
+        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
 
         CCScrollbarLayerImpl* ccChild1 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[0]);
         CCLayerImpl* ccChild2 = ccLayerTreeRoot->children()[1];
@@ -101,7 +101,7 @@
     layerTreeRoot->setMaxScrollPosition(IntSize(30, 50));
     contentLayer->setBounds(IntSize(100, 200));
 
-    scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
+    OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
 
     CCScrollbarLayerImpl* ccScrollbarLayer = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1]);
 
@@ -114,7 +114,7 @@
     contentLayer->setBounds(IntSize(1000, 2000));
 
     CCScrollbarAnimationController* scrollbarController = ccLayerTreeRoot->scrollbarAnimationController();
-    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.Pass(), 0);
+    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.release(), 0);
     EXPECT_EQ(scrollbarController, ccLayerTreeRoot->scrollbarAnimationController());
 
     EXPECT_EQ(100, ccScrollbarLayer->currentPos());