SkBitmap and SkPixelRef no longer need lock/unlock

content/browser/renderer_host/render_widget_host_view_browsertest.cc

Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index fb74aa1d646c48c1c79c7859fcee99314247875f..892fa93d53f8222a4bf2b8bc4baa5ecb2e3bc910 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -398,8 +398,6 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
       return;
     }
 
-    SkAutoLockPixels bitmap_lock(bitmap);
-
     // Check that the |bitmap| contains cyan and/or yellow pixels.  This is
     // needed because the compositor will read back "blank" frames until the
     // first frame from the renderer is composited.  See comments in
@@ -438,7 +436,6 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
     EXPECT_EQ(expected_bitmap.width(), bitmap.width());
     EXPECT_EQ(expected_bitmap.height(), bitmap.height());
     EXPECT_EQ(expected_bitmap.colorType(), bitmap.colorType());
-    SkAutoLockPixels expected_bitmap_lock(expected_bitmap);
     int fails = 0;
     for (int i = 0; i < bitmap.width() && fails < 10; ++i) {
       for (int j = 0; j < bitmap.height() && fails < 10; ++j) {
@@ -656,13 +653,10 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
     // Left half is #0ff.
     bitmap->eraseARGB(255, 0, 255, 255);
     // Right half is #ff0.
-    {
-      SkAutoLockPixels lock(*bitmap);
-      for (int i = 0; i < copy_size.width() / 2; ++i) {
-        for (int j = 0; j < copy_size.height(); ++j) {
-          *(bitmap->getAddr32(copy_size.width() / 2 + i, j)) =
-              SkColorSetARGB(255, 255, 255, 0);
-        }
+    for (int i = 0; i < copy_size.width() / 2; ++i) {
+      for (int j = 0; j < copy_size.height(); ++j) {
+        *(bitmap->getAddr32(copy_size.width() / 2 + i, j)) =
+            SkColorSetARGB(255, 255, 255, 0);
       }
     }
   }