SkBitmap and SkPixelRef no longer need lock/unlock

components/wallpaper/wallpaper_resizer_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 "components/wallpaper/wallpaper_resizer.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 32 matching lines @@
     }
   }
 
   gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(src);
   return image;
 }
 
 bool IsColor(const gfx::ImageSkia& image, const uint32_t expect) {
   EXPECT_EQ(image.width(), kTargetWidth);
   EXPECT_EQ(image.height(), kTargetHeight);
-  const SkBitmap* image_bitmap = image.bitmap();
-  SkAutoLockPixels image_lock(*image_bitmap);
-  return *image_bitmap->getAddr32(0, 0) == expect;
+  return *image.bitmap()->getAddr32(0, 0) == expect;
 }
 
 }  // namespace
 
 namespace wallpaper {
 
 class WallpaperResizerTest : public testing::Test,
                              public WallpaperResizerObserver {
  public:
   WallpaperResizerTest() : worker_thread_("WallpaperResizerTest") {}
@@ skipping 90 matching lines @@
                            task_runner());
   EXPECT_EQ(WallpaperResizer::GetImageId(image), resizer.original_image_id());
   resizer.AddObserver(this);
   resizer.StartResize();
   WaitForResize();
   resizer.RemoveObserver(this);
   EXPECT_EQ(WallpaperResizer::GetImageId(image), resizer.original_image_id());
 }
 
 }  // namespace ash