[cc] Store CCLayerImpls as scoped_ptrs

cc/ScrollbarLayerChromiumTest.cpp

 // 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.
 
 #include "config.h"
 
 #include "ScrollbarLayerChromium.h"
 
 #include "CCScrollbarAnimationController.h"
 #include "CCScrollbarLayerImpl.h"
@@ skipping 39 matching lines @@
     WebKit::WebScrollbarThemePainter painter;
 
     {
         OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
         scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create();
         scoped_refptr<LayerChromium> child1 = LayerChromium::create();
         scoped_refptr<LayerChromium> child2 = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), child1->id());
         layerTreeRoot->addChild(child1);
         layerTreeRoot->addChild(child2);
 
-        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
+        scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
 
         CCLayerImpl* ccChild1 = ccLayerTreeRoot->children()[0];
         CCScrollbarLayerImpl* ccChild2 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1]);
 
         EXPECT_TRUE(ccChild1->scrollbarAnimationController());
         EXPECT_EQ(ccChild1->horizontalScrollbarLayer(), ccChild2);
     }
 
     { // another traverse order
         OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
         scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create();
         scoped_refptr<LayerChromium> child2 = LayerChromium::create();
         scoped_refptr<LayerChromium> child1 = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), child2->id());
         layerTreeRoot->addChild(child1);
         layerTreeRoot->addChild(child2);
 
-        OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
+        scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
 
         CCScrollbarLayerImpl* ccChild1 = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[0]);
         CCLayerImpl* ccChild2 = ccLayerTreeRoot->children()[1];
 
         EXPECT_TRUE(ccChild2->scrollbarAnimationController());
         EXPECT_EQ(ccChild2->horizontalScrollbarLayer(), ccChild1);
     }
 }
 
 TEST(ScrollbarLayerChromiumTest, scrollOffsetSynchronization)
 {
     DebugScopedSetImplThread impl;
 
     WebKit::WebScrollbarThemePainter painter;
 
     OwnPtr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
     scoped_refptr<LayerChromium> layerTreeRoot = LayerChromium::create();
     scoped_refptr<LayerChromium> contentLayer = LayerChromium::create();
     scoped_refptr<LayerChromium> scrollbarLayer = ScrollbarLayerChromium::create(scrollbar.release(), painter, WebKit::FakeWebScrollbarThemeGeometry::create(), layerTreeRoot->id());
     layerTreeRoot->addChild(contentLayer);
     layerTreeRoot->addChild(scrollbarLayer);
 
     layerTreeRoot->setScrollPosition(IntPoint(10, 20));
     layerTreeRoot->setMaxScrollPosition(IntSize(30, 50));
     contentLayer->setBounds(IntSize(100, 200));
 
-    OwnPtr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), nullptr, 0);
+    scoped_ptr<CCLayerImpl> ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), scoped_ptr<CCLayerImpl>(), 0);
 
     CCScrollbarLayerImpl* ccScrollbarLayer = static_cast<CCScrollbarLayerImpl*>(ccLayerTreeRoot->children()[1]);
 
     EXPECT_EQ(10, ccScrollbarLayer->currentPos());
     EXPECT_EQ(100, ccScrollbarLayer->totalSize());
     EXPECT_EQ(30, ccScrollbarLayer->maximum());
 
     layerTreeRoot->setScrollPosition(IntPoint(100, 200));
     layerTreeRoot->setMaxScrollPosition(IntSize(300, 500));
     contentLayer->setBounds(IntSize(1000, 2000));
 
     CCScrollbarAnimationController* scrollbarController = ccLayerTreeRoot->scrollbarAnimationController();
-    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.release(), 0);
+    ccLayerTreeRoot = TreeSynchronizer::synchronizeTrees(layerTreeRoot.get(), ccLayerTreeRoot.Pass(), 0);
     EXPECT_EQ(scrollbarController, ccLayerTreeRoot->scrollbarAnimationController());
 
     EXPECT_EQ(100, ccScrollbarLayer->currentPos());
     EXPECT_EQ(1000, ccScrollbarLayer->totalSize());
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 
     ccLayerTreeRoot->scrollBy(FloatSize(12, 34));
 
     EXPECT_EQ(112, ccScrollbarLayer->currentPos());
     EXPECT_EQ(1000, ccScrollbarLayer->totalSize());
     EXPECT_EQ(300, ccScrollbarLayer->maximum());
 }
 
 }