SkColorType instead of (deprecated) SkBitmap::Config

cc/resources/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/fake_rendering_stats_instrumentation.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 656 matching lines @@
       gfx::Rect content_rect(offset_x, offset_y, step_x, step_y);
       content_rect.Intersect(gfx::Rect(content_bounds));
 
       // Simulate a canvas rect larger than the content rect.  Every pixel
       // up to one pixel outside the content rect is guaranteed to be opaque.
       // Outside of that is undefined.
       gfx::Rect canvas_rect(content_rect);
       canvas_rect.Inset(0, 0, -1, -1);
 
       SkBitmap bitmap;
-      bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                       canvas_rect.width(),
-                       canvas_rect.height());
-      bitmap.allocPixels();
+      bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
       SkCanvas canvas(bitmap);
       canvas.clear(SK_ColorTRANSPARENT);
 
       FakeRenderingStatsInstrumentation rendering_stats_instrumentation;
 
       pile->RasterToBitmap(&canvas,
                            canvas_rect,
                            contents_scale,
                            &rendering_stats_instrumentation);
 
@@ skipping 28 matching lines @@
   pile->set_clear_canvas_with_debug_color(false);
   pile->RerecordPile();
 
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
   SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                   canvas_rect.width(),
-                   canvas_rect.height());
-  bitmap.allocPixels();
+  bitmap.allocN32Pixels(canvas_rect.width(), canvas_rect.height());
   SkCanvas canvas(bitmap);
 
   FakeRenderingStatsInstrumentation rendering_stats_instrumentation;
   pile->RasterToBitmap(
       &canvas, canvas_rect, contents_scale, &rendering_stats_instrumentation);
 
   SkColor* pixels = reinterpret_cast<SkColor*>(bitmap.getPixels());
   int num_pixels = bitmap.width() * bitmap.height();
   for (int i = 0; i < num_pixels; ++i) {
     EXPECT_EQ(SkColorGetA(pixels[i]), 0u);
@@ skipping 138 matching lines @@
     EXPECT_TRUE(iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[2].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc