Update GatherPixelRefDevice to the new SkImage/SkPixelRef API

cc/playback/picture_pile_impl_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 149 matching lines @@
 }
 
 TEST(PicturePileImplTest, PixelRefIteratorDiscardableRefsOneTile) {
   gfx::Size tile_size(256, 256);
   gfx::Size layer_bounds(512, 512);
 
   scoped_ptr<FakePicturePile> recording_source =
       FakePicturePile::CreateFilledPile(tile_size, layer_bounds);
 
   SkBitmap discardable_bitmap[2][2];
-  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][0]);
-  CreateBitmap(gfx::Size(32, 32), "discardable", &discardable_bitmap[0][1]);
-  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[0][1]);
+  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[0][1],
                                     gfx::Point(260, 0));
@@ skipping 340 matching lines @@
       recording_source->tiling().TileBounds(2, 0),
   };
   gfx::RectF expected_rects[] = {
       gfx::RectF(recording_source->tiling().TileBounds(0, 0)),
       gfx::RectF(recording_source->tiling().TileBounds(1, 0)),
       gfx::RectF(recording_source->tiling().TileBounds(2, 0)),
   };
   SkBitmap discardable_bitmap[arraysize(bitmap_rects)];
 
   for (size_t i = 0; i < arraysize(bitmap_rects); ++i) {
-    CreateBitmap(bitmap_rects[i].size(), "discardable", &discardable_bitmap[i]);
+    CreateDiscardableBitmap(bitmap_rects[i].size(), &discardable_bitmap[i]);
     recording_source->add_draw_bitmap(discardable_bitmap[i],
                                       bitmap_rects[i].origin());
   }
 
   recording_source->SetGatherPixelRefs(true);
   recording_source->Rerecord();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFromPile(recording_source.get(), nullptr);
 
@@ skipping 58 matching lines @@
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(iterator->pixel_ref == discardable_bitmap[2].pixelRef());
     EXPECT_EQ(expected_rects[2].ToString(),
               gfx::SkRectToRectF(iterator->pixel_ref_rect).ToString());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc