Update from https://crrev.com/317530

skia/ext/platform_canvas_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.
 
 // TODO(awalker): clean up the const/non-const reference handling in this test
 
 #include "skia/ext/platform_canvas.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 400 matching lines @@
   EXPECT_TRUE(0 != platform_bitmap->GetSurface());
   EXPECT_FALSE(platform_bitmap->GetBitmap().empty());
   EXPECT_FALSE(platform_bitmap->GetBitmap().isNull());
   EXPECT_EQ(kWidth, platform_bitmap->GetBitmap().width());
   EXPECT_EQ(kHeight, platform_bitmap->GetBitmap().height());
   EXPECT_LE(static_cast<size_t>(platform_bitmap->GetBitmap().width()*4),
             platform_bitmap->GetBitmap().rowBytes());
   EXPECT_EQ(kN32_SkColorType,  // Same for all platforms.
             platform_bitmap->GetBitmap().colorType());
   EXPECT_TRUE(platform_bitmap->GetBitmap().lockPixelsAreWritable());
+#if defined(SK_DEBUG)
   EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->isLocked());
+#endif
   EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->unique());
 
   *(platform_bitmap->GetBitmap().getAddr32(10, 20)) = 0xDEED1020;
   *(platform_bitmap->GetBitmap().getAddr32(20, 30)) = 0xDEED2030;
 
   SkBitmap sk_bitmap = platform_bitmap->GetBitmap();
   sk_bitmap.lockPixels();
 
   EXPECT_FALSE(platform_bitmap->GetBitmap().pixelRef()->unique());
   EXPECT_FALSE(sk_bitmap.pixelRef()->unique());
@@ skipping 18 matching lines @@
 
   sk_bitmap.lockPixels();
   EXPECT_EQ(0xDEED1020, *sk_bitmap.getAddr32(10, 20));
   EXPECT_EQ(0xDEED2030, *sk_bitmap.getAddr32(20, 30));
   EXPECT_EQ(0xDEED3040, *sk_bitmap.getAddr32(30, 40));
   sk_bitmap.unlockPixels();
 }
 
 
 }  // namespace skia