[cc] Store CCLayerImpls as scoped_ptrs

cc/CCLayerTreeHostTest.cpp

 // Copyright 2011 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 "CCLayerTreeHost.h"
 
 #include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
@@ skipping 2410 matching lines @@
     bool m_updated;
 };
 
 class EvictionTestLayer : public LayerChromium {
 public:
     static scoped_refptr<EvictionTestLayer> create() { return make_scoped_refptr(new EvictionTestLayer()); }
 
     virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
     virtual bool drawsContent() const OVERRIDE { return true; }
 
-    virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
+    virtual scoped_ptr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
     virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
     virtual void setTexturePriorities(const CCPriorityCalculator&) OVERRIDE;
 
     void resetUpdated()
     {
         if (m_texture.get())
             m_texture->resetUpdated();
     }
     bool updated() const { return m_texture.get() ? m_texture->updated() : false; }
 
 private:
     EvictionTestLayer() : LayerChromium() { }
     ~EvictionTestLayer() { }
 
     void createTextureIfNeeded()
     {
         if (m_texture.get())
             return;
         m_texture = EvictionTrackingTexture::create(CCPrioritizedTexture::create(layerTreeHost()->contentsTextureManager()));
         m_texture->texture()->setDimensions(IntSize(10, 10), cc::GraphicsContext3D::RGBA);
     }
 
     OwnPtr<EvictionTrackingTexture> m_texture;
 };
 
 class EvictionTestLayerImpl : public CCLayerImpl {
 public:
-    static PassOwnPtr<EvictionTestLayerImpl> create(int id)
+    static scoped_ptr<EvictionTestLayerImpl> create(int id)
     {
-        return adoptPtr(new EvictionTestLayerImpl(id));
+        return make_scoped_ptr(new EvictionTestLayerImpl(id));
     }
     virtual ~EvictionTestLayerImpl() { }
 
     virtual void appendQuads(CCQuadSink& quadSink, CCAppendQuadsData&) OVERRIDE
     {
         ASSERT_TRUE(m_hasTexture);
         ASSERT_NE(0u, layerTreeHostImpl()->resourceProvider()->numResources());
     }
 
     void setHasTexture(bool hasTexture) { m_hasTexture = hasTexture; }
@@ skipping 17 matching lines @@
 void EvictionTestLayer::update(CCTextureUpdateQueue& queue, const CCOcclusionTracker*, CCRenderingStats&)
 {
     createTextureIfNeeded();
     if (!m_texture.get())
         return;
     IntRect fullRect(0, 0, 10, 10);
     TextureUploader::Parameters parameters = { m_texture.get(), fullRect, IntSize() };
     queue.appendFullUpload(parameters);
 }
 
-PassOwnPtr<CCLayerImpl> EvictionTestLayer::createCCLayerImpl()
+scoped_ptr<CCLayerImpl> EvictionTestLayer::createCCLayerImpl()
 {
-    return EvictionTestLayerImpl::create(m_layerId);
+    return EvictionTestLayerImpl::create(m_layerId).PassAs<CCLayerImpl>();
 }
 
 void EvictionTestLayer::pushPropertiesTo(CCLayerImpl* layerImpl)
 {
     LayerChromium::pushPropertiesTo(layerImpl);
 
     EvictionTestLayerImpl* testLayerImpl = static_cast<EvictionTestLayerImpl*>(layerImpl);
     testLayerImpl->setHasTexture(m_texture->texture()->haveBackingTexture());
 }
 
@@ skipping 482 matching lines @@
     int m_numCommitComplete;
     int m_numDrawLayers;
 };
 
 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace