Remove uses of skia::ReadPixels(PaintCanvas)

ui/gfx/color_utils_unittest.cc

 // Copyright (c) 2006-2008 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 <stdlib.h>
 
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
@@ skipping 110 matching lines @@
   SkBitmap bitmap;
   EXPECT_DOUBLE_EQ(1.0, CalculateBoringScore(bitmap));
 }
 
 TEST(ColorUtils, CalculateBoringScore_SingleColor) {
   const gfx::Size kSize(20, 10);
   gfx::Canvas canvas(kSize, 1.0f, true);
   // Fill all pixels in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
 
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
   // The thumbnail should deserve the highest boring score.
   EXPECT_DOUBLE_EQ(1.0, CalculateBoringScore(bitmap));
 }
 
 TEST(ColorUtils, CalculateBoringScore_TwoColors) {
   const gfx::Size kSize(20, 10);
 
   gfx::Canvas canvas(kSize, 1.0f, true);
   // Fill all pixels in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
   // Fill the left half pixels in white.
   canvas.FillRect(gfx::Rect(0, 0, kSize.width() / 2, kSize.height()),
                   SK_ColorWHITE);
 
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
   ASSERT_EQ(kSize.width(), bitmap.width());
   ASSERT_EQ(kSize.height(), bitmap.height());
   // The thumbnail should be less boring because two colors are used.
   EXPECT_DOUBLE_EQ(0.5, CalculateBoringScore(bitmap));
 }
 
 TEST(ColorUtils, AlphaBlend) {
   SkColor fore = SkColorSetARGB(255, 200, 200, 200);
   SkColor back = SkColorSetARGB(255, 100, 100, 100);
 
   EXPECT_TRUE(AlphaBlend(fore, back, 255) == fore);
   EXPECT_TRUE(AlphaBlend(fore, back, 0) == back);
 
   // One is fully transparent, result is partially transparent.
   back = SkColorSetA(back, 0);
   EXPECT_EQ(136U, SkColorGetA(AlphaBlend(fore, back, 136)));
 
   // Both are fully transparent, result is fully transparent.
   fore = SkColorSetA(fore, 0);
   EXPECT_EQ(0U, SkColorGetA(AlphaBlend(fore, back, 255)));
 }
 
 }  // namespace color_utils