cc: Store tiles, painters, tiling data in scoped_ptr

cc/tiled_layer_unittest.cc

 // 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 "TiledLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCAnimationTestCommon.h"
@@ skipping 1439 matching lines @@
         }
     }
     ccLayerTreeHost->commitComplete();
 
     textureManagerClearAllMemory(ccLayerTreeHost->contentsTextureManager(), m_resourceProvider.get());
     ccLayerTreeHost->setRootLayer(0);
 }
 
 class TrackingLayerPainter : public LayerPainterChromium {
 public:
-    static PassOwnPtr<TrackingLayerPainter> create() { return adoptPtr(new TrackingLayerPainter()); }
+    static scoped_ptr<TrackingLayerPainter> create() { return make_scoped_ptr(new TrackingLayerPainter()); }
 
     virtual void paint(SkCanvas*, const IntRect& contentRect, FloatRect&) OVERRIDE
     {
         m_paintedRect = contentRect;
     }
 
     const IntRect& paintedRect() const { return m_paintedRect; }
     void resetPaintedRect() { m_paintedRect = IntRect(); }
 
 private:
     TrackingLayerPainter() { }
 
     IntRect m_paintedRect;
 };
 
 class UpdateTrackingTiledLayerChromium : public FakeTiledLayerChromium {
 public:
     explicit UpdateTrackingTiledLayerChromium(CCPrioritizedTextureManager* manager)
         : FakeTiledLayerChromium(manager)
     {
-        OwnPtr<TrackingLayerPainter> trackingLayerPainter(TrackingLayerPainter::create());
+        scoped_ptr<TrackingLayerPainter> trackingLayerPainter(TrackingLayerPainter::create());
         m_trackingLayerPainter = trackingLayerPainter.get();
-        m_layerTextureUpdater = BitmapCanvasLayerTextureUpdater::create(trackingLayerPainter.release());
+        m_layerTextureUpdater = BitmapCanvasLayerTextureUpdater::create(trackingLayerPainter.PassAs<LayerPainterChromium>());
     }
 
     TrackingLayerPainter* trackingLayerPainter() const { return m_trackingLayerPainter; }
 
 protected:
     virtual ~UpdateTrackingTiledLayerChromium() { }
 
     virtual LayerTextureUpdater* textureUpdater() const OVERRIDE { return m_layerTextureUpdater.get(); }
 
 private:
@@ skipping 56 matching lines @@
     updateTextures();
 
     // Invalidate the entire layer in layer space. When painting, the rect given to webkit should match the layer's bounds.
     layer->setNeedsDisplayRect(layerRect);
     layer->update(*m_queue.get(), 0, m_stats);
 
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
 } // namespace