SkBitmap and SkPixelRef no longer need lock/unlock

ui/gfx/image/image_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 488 matching lines @@
 
   EXPECT_TRUE(ns_image);
   base::mac::NSObjectRelease(ns_image);
 }
 #endif
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
 
   const SkBitmap* bitmap = image.ToSkBitmap();
-  SkAutoLockPixels auto_lock(*bitmap);
   gt::CheckColors(bitmap->getColor(10, 10), SK_ColorGREEN);
 }
 
 TEST_F(ImageTest, SkBitmapConversionPreservesOrientation) {
   const int width = 50;
   const int height = 50;
   SkBitmap bitmap;
   bitmap.allocN32Pixels(width, height);
   bitmap.eraseARGB(255, 0, 255, 0);
 
@@ skipping 17 matching lines @@
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
         SK_ColorRED);
     gt::CheckColors(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40),
         SK_ColorGREEN);
   }
 
   // Force a conversion back to SkBitmap and check that the upper half is red.
   gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
   const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
-  SkAutoLockPixels auto_lock(*bitmap2);
   {
     SCOPED_TRACE("Checking color after conversion back to SkBitmap");
     gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
     gt::CheckColors(bitmap2->getColor(10, 40), SK_ColorGREEN);
   }
 }
 
 TEST_F(ImageTest, SkBitmapConversionPreservesTransparency) {
   const int width = 50;
   const int height = 50;
@@ skipping 20 matching lines @@
     gt::CheckColors(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 10),
         SK_ColorRED);
     gt::CheckIsTransparent(
         gt::GetPlatformImageColor(gt::ToPlatformType(from_skbitmap), 10, 40));
   }
 
   // Force a conversion back to SkBitmap and check that the upper half is red.
   gfx::Image from_platform(gt::CopyPlatformType(from_skbitmap));
   const SkBitmap* bitmap2 = from_platform.ToSkBitmap();
-  SkAutoLockPixels auto_lock(*bitmap2);
   {
     SCOPED_TRACE("Checking color after conversion back to SkBitmap");
     gt::CheckColors(bitmap2->getColor(10, 10), SK_ColorRED);
     gt::CheckIsTransparent(bitmap.getColor(10, 40));
   }
 }
 
 TEST_F(ImageTest, SwapRepresentations) {
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
@@ skipping 106 matching lines @@
         gfx::ImageSkiaRep(bitmap, 1.0f)));
   }
   EXPECT_TRUE(!image.ToSkBitmap()->isNull());
 }
 
 // Integration tests with UI toolkit frameworks require linking against the
 // Views library and cannot be here (ui_base_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace