SkBitmap and SkPixelRef no longer need lock/unlock

components/favicon_base/select_favicon_frames_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 "components/favicon_base/select_favicon_frames.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 41 matching lines @@
 }
 
 SkColor GetColor(const gfx::ImageSkia& image, float scale,
                  int x = -1, int y = -1) {
   const SkBitmap& bitmap =
       image.GetRepresentation(scale).sk_bitmap();
   if (x == -1)
     x = bitmap.width() / 2;
   if (y == -1)
     y = bitmap.width() / 2;
-  bitmap.lockPixels();
   SkColor color = bitmap.getColor(x, y);
-  bitmap.unlockPixels();
   return color;
 }
 
 SkColor GetColor1x(const gfx::ImageSkia& image) {
   return GetColor(image, 1.0f);
 }
 
 SkColor GetColor2x(const gfx::ImageSkia& image) {
   return GetColor(image, 2.0f);
 }
@@ skipping 247 matching lines @@
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   vector<gfx::Size> sizes2;
   sizes2.push_back(gfx::Size(15, 15));
   float score2;
   CreateFaviconImageSkia(bitmaps2, sizes2, 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 }  // namespace