Update GatherPixelRefDevice to the new SkImage/SkPixelRef API

cc/playback/recording_source_unittest.cc

 // Copyright 2015 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 <vector>
 
 #include "cc/playback/display_list_raster_source.h"
 #include "cc/test/fake_display_list_recording_source.h"
 #include "cc/test/fake_picture_pile.h"
 #include "cc/test/fake_picture_pile_impl.h"
@@ skipping 143 matching lines @@
   gfx::Size grid_cell_size(128, 128);
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   scoped_ptr<TypeParam> recording_source =
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
 
   SkPaint simple_paint;
   simple_paint.setColor(SkColorSetARGB(255, 12, 23, 34));
 
   SkBitmap non_discardable_bitmap;
-  CreateBitmap(gfx::Size(128, 128), "notdiscardable", &non_discardable_bitmap);
+  non_discardable_bitmap.allocN32Pixels(128, 128);
+  non_discardable_bitmap.setImmutable();
 
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 0, 256, 256),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(128, 128, 512, 512),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(512, 0, 256, 256),
                                              simple_paint);
   recording_source->add_draw_rect_with_paint(gfx::Rect(0, 512, 256, 256),
                                              simple_paint);
   recording_source->add_draw_bitmap(non_discardable_bitmap, gfx::Point(128, 0));
@@ skipping 59 matching lines @@
 }
 
 TYPED_TEST(RecordingSourceTest, DiscardablePixelRefs) {
   gfx::Size grid_cell_size(128, 128);
   gfx::Rect recorded_viewport(0, 0, 256, 256);
 
   scoped_ptr<TypeParam> recording_source =
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
 
   SkBitmap discardable_bitmap[2][2];
-  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][0]);
-  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[1][0]);
-  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[1][1]);
+  CreateDiscardableBitmap(gfx::Size(32, 32), &discardable_bitmap[0][0]);
+  CreateDiscardableBitmap(gfx::Size(32, 32), &discardable_bitmap[1][0]);
+  CreateDiscardableBitmap(gfx::Size(32, 32), &discardable_bitmap[1][1]);
 
   // Discardable pixel refs are found in the following cells:
   // |---|---|
   // | x |   |
   // |---|---|
   // | x | x |
   // |---|---|
   recording_source->add_draw_bitmap(discardable_bitmap[0][0], gfx::Point(0, 0));
   recording_source->add_draw_bitmap(discardable_bitmap[1][0],
                                     gfx::Point(0, 130));
@@ skipping 113 matching lines @@
 }
 
 TYPED_TEST(RecordingSourceTest, DiscardablePixelRefsBaseNonDiscardable) {
   gfx::Size grid_cell_size(256, 256);
   gfx::Rect recorded_viewport(0, 0, 512, 512);
 
   scoped_ptr<TypeParam> recording_source =
       CreateRecordingSource<TypeParam>(recorded_viewport, grid_cell_size);
 
   SkBitmap non_discardable_bitmap;
-  CreateBitmap(gfx::Size(512, 512), "notdiscardable", &non_discardable_bitmap);
+  non_discardable_bitmap.allocN32Pixels(512, 512);
+  non_discardable_bitmap.setImmutable();
 
   SkBitmap discardable_bitmap[2][2];
-  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[0][0]);
-  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[0][1]);
-  CreateBitmap(gfx::Size(128, 128), "discardable", &discardable_bitmap[1][1]);
+  CreateDiscardableBitmap(gfx::Size(128, 128), &discardable_bitmap[0][0]);
+  CreateDiscardableBitmap(gfx::Size(128, 128), &discardable_bitmap[0][1]);
+  CreateDiscardableBitmap(gfx::Size(128, 128), &discardable_bitmap[1][1]);
 
   // One large non-discardable bitmap covers the whole grid.
   // Discardable pixel refs are found in the following cells:
   // |---|---|
   // | x | x |
   // |---|---|
   // |   | x |
   // |---|---|
   recording_source->add_draw_bitmap(non_discardable_bitmap, gfx::Point(0, 0));
   recording_source->add_draw_bitmap(discardable_bitmap[0][0], gfx::Point(0, 0));
@@ skipping 108 matching lines @@
               gfx::SkRectToRectF(pixel_refs[0].pixel_ref_rect).ToString());
     EXPECT_EQ(gfx::RectF(260, 0, 128, 128).ToString(),
               gfx::SkRectToRectF(pixel_refs[1].pixel_ref_rect).ToString());
     EXPECT_EQ(gfx::RectF(260, 260, 128, 128).ToString(),
               gfx::SkRectToRectF(pixel_refs[2].pixel_ref_rect).ToString());
   }
 }
 
 }  // namespace
 }  // namespace cc