SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/image/image_unittest_util.cc

Index: ui/gfx/image/image_unittest_util.cc
diff --git a/ui/gfx/image/image_unittest_util.cc b/ui/gfx/image/image_unittest_util.cc
index f589f464a0ac69f2f86606e986b94cec1d6e95f5..32a8ed08af635b30e06f9f70fda8b999ebc7cabf 100644
--- a/ui/gfx/image/image_unittest_util.cc
+++ b/ui/gfx/image/image_unittest_util.cc
@@ -137,8 +137,6 @@ bool AreBitmapsClose(const SkBitmap& bmp1,
     return false;
   }
 
-  SkAutoLockPixels lock1(bmp1);
-  SkAutoLockPixels lock2(bmp2);
   if (!bmp1.getPixels() || !bmp2.getPixels())
     return false;
 
@@ -174,7 +172,6 @@ void CheckImageIndicatesPNGDecodeFailure(const gfx::Image& image) {
   EXPECT_FALSE(bitmap.isNull());
   EXPECT_LE(16, bitmap.width());
   EXPECT_LE(16, bitmap.height());
-  SkAutoLockPixels auto_lock(bitmap);
   CheckColors(bitmap.getColor(10, 10), SK_ColorRED);
 }
 
@@ -271,9 +268,7 @@ PlatformImage CopyPlatformType(const gfx::Image& image) {
 // Defined in image_unittest_util_mac.mm.
 #else
 SkColor GetPlatformImageColor(PlatformImage image, int x, int y) {
-  SkBitmap bitmap = *image.bitmap();
-  SkAutoLockPixels auto_lock(bitmap);
-  return bitmap.getColor(x, y);
+  return image.bitmap()->getColor(x, y);
 }
 #endif