SkColorType instead of (deprecated) SkBitmap::Config

cc/trees/layer_tree_host_pixeltest_readback.cc

Index: cc/trees/layer_tree_host_pixeltest_readback.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_readback.cc b/cc/trees/layer_tree_host_pixeltest_readback.cc
index e7845359dea29d7313041689fc49db32e3521aa3..e8ad466dfa72633c83b7b164a5239bc501ee9ba1 100644
--- a/cc/trees/layer_tree_host_pixeltest_readback.cc
+++ b/cc/trees/layer_tree_host_pixeltest_readback.cc
@@ -1109,15 +1109,10 @@ class LayerTreeHostReadbackViaCompositeAndReadbackPixelTest
       device_viewport_copy_rect.Intersect(device_viewport_copy_subrect_);
 
     scoped_ptr<SkBitmap> bitmap(new SkBitmap);
-    bitmap->setConfig(SkBitmap::kARGB_8888_Config,
-                      device_viewport_copy_rect.width(),
-                      device_viewport_copy_rect.height());
-    bitmap->allocPixels();
-    {
-      scoped_ptr<SkAutoLockPixels> lock(new SkAutoLockPixels(*bitmap));
-      layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),
-                                              device_viewport_copy_rect);
-    }
+    bitmap->allocN32Pixels(device_viewport_copy_rect.width(),
+                           device_viewport_copy_rect.height());
+    layer_tree_host()->CompositeAndReadback(bitmap->getPixels(),

[Stephen White, 2014/03/18 20:14:07]

Possibly-dumb question: why do we no longer need an autolock here? Won't
getPixels() return NULL without it?

[reed1, 2014/03/21 20:49:01]

allocPixels (and its helper variants like allocN32Pixels) *always* also call
lock. This was true before this CL as well, in that the previous AutoLockPixels
code is unnecessary.

+                                            device_viewport_copy_rect);
 
     result_bitmap_ = bitmap.Pass();
     EndTest();