SkBitmap and SkPixelRef no longer need lock/unlock

chrome/browser/chromeos/accessibility/accessibility_highlight_manager_interactive_uitest.cc

 // Copyright (c) 2016 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 "chrome/browser/chromeos/accessibility/accessibility_highlight_manager.h"
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ skipping 74 matching lines @@
   }
 
   void CaptureAfterImage(const gfx::Rect& bounds) {
     Capture(bounds);
     image_.AsBitmap().deepCopyTo(&after_bmp_);
   }
 
   void ComputeImageStats() {
     diff_count_ = 0;
     double accum[4] = {0, 0, 0, 0};
-    SkAutoLockPixels lock_before(before_bmp_);
-    SkAutoLockPixels lock_after(after_bmp_);
     for (int x = 0; x < before_bmp_.width(); ++x) {
       for (int y = 0; y < before_bmp_.height(); ++y) {
         SkColor before_color = before_bmp_.getColor(x, y);
         SkColor after_color = after_bmp_.getColor(x, y);
         if (before_color != after_color) {
           diff_count_++;
           accum[0] += SkColorGetB(after_color);
           accum[1] += SkColorGetG(after_color);
           accum[2] += SkColorGetR(after_color);
           accum[3] += SkColorGetA(after_color);
@@ skipping 25 matching lines @@
       aura::Window* window = ash::Shell::GetPrimaryRootWindow();
       ui::GrabWindowSnapshotAndScaleAsync(
           window, bounds, bounds.size(),
           content::BrowserThread::GetBlockingPool(),
           base::Bind(&AccessibilityHighlightManagerTest::GotSnapshot,
                      base::Unretained(this)));
       base::RunLoop run_loop;
       run_loop_quitter_ = run_loop.QuitClosure();
       run_loop.Run();
       SkBitmap bitmap = image_.AsBitmap();
-      SkAutoLockPixels lock(bitmap);
       if (bitmap.width() != bounds.width() ||
           bitmap.height() != bounds.height()) {
         LOG(INFO) << "Bitmap not correct size, trying to capture again";
         continue;
       }
       if (255 == SkColorGetA(bitmap.getColor(0, 0))) {
         LOG(INFO) << "Bitmap is transparent, trying to capture again";
         break;
       }
     }
@@ skipping 77 matching lines @@
   // This is a smoke test to assert that something is drawn in the right
   // part of the screen of approximately the right size and color.
   // There's deliberately some tolerance for tiny errors.
   EXPECT_NEAR(1608, diff_count(), 50);
   EXPECT_NEAR(255, SkColorGetR(average_diff_color()), 5);
   EXPECT_NEAR(201, SkColorGetG(average_diff_color()), 5);
   EXPECT_NEAR(152, SkColorGetB(average_diff_color()), 5);
 }
 
 }  // namespace chromeos