cc: Added raster source.

cc/resources/picture_pile_unittest.cc

Index: cc/resources/picture_pile_unittest.cc
diff --git a/cc/resources/picture_pile_unittest.cc b/cc/resources/picture_pile_unittest.cc
index 537872da89a123c67a1099539ee6a0d90c9061e3..2722090a83d56d4ecc8a22493ad90ada5afb9f5e 100644
--- a/cc/resources/picture_pile_unittest.cc
+++ b/cc/resources/picture_pile_unittest.cc
@@ -17,6 +17,8 @@ namespace {
 
 class TestPicturePile : public PicturePile {
  public:
+  ~TestPicturePile() override {}
+
   using PicturePile::buffer_pixels;
   using PicturePile::CanRasterSlowTileCheck;
   using PicturePile::Clear;
@@ -31,9 +33,6 @@ class TestPicturePile : public PicturePile {
   typedef PicturePile::PictureInfo PictureInfo;
   typedef PicturePile::PictureMapKey PictureMapKey;
   typedef PicturePile::PictureMap PictureMap;
-
- protected:
-  ~TestPicturePile() override {}
 };
 
 class PicturePileTestBase {
@@ -45,7 +44,7 @@ class PicturePileTestBase {
         contents_opaque_(false) {}
 
   void InitializeData() {
-    pile_ = make_scoped_refptr(new TestPicturePile());
+    pile_.reset(new TestPicturePile());
     pile_->SetTileGridSize(gfx::Size(1000, 1000));
     pile_->SetMinContentsScale(min_scale_);
     client_ = FakeContentLayerClient();
@@ -87,7 +86,7 @@ class PicturePileTestBase {
 
   FakeContentLayerClient client_;
   FakeRenderingStatsInstrumentation stats_instrumentation_;
-  scoped_refptr<TestPicturePile> pile_;
+  scoped_ptr<TestPicturePile> pile_;

[enne (OOO), 2014/10/24 22:27:35]

This could probably just be a member too...

[vmpstr, 2014/10/24 23:15:23]

I did that first and then I thought "but that changes behaviour, since we don't
reset it back to the default state". I'll change it and see if the tests are
happy

   SkColor background_color_;
   float min_scale_;
   int frame_number_;