Remove uses of skia::ReadPixels(PaintCanvas)

ui/gfx/color_analysis_unittest.cc

Index: ui/gfx/color_analysis_unittest.cc
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index 821c3eae09dadcb05fe120bd7ba8f1a300437a75..4b6a465105786b983d943e68624ad49e47fbbbc2 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -345,8 +345,7 @@ TEST_F(ColorAnalysisTest, ComputeColorCovarianceWithCanvas) {
   canvas.FillRect(gfx::Rect(150, 0, 50, 200), SkColorSetRGB(0, 100, 100));
   canvas.FillRect(gfx::Rect(200, 0, 50, 200), SkColorSetRGB(0, 0, 100));
 
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
-  gfx::Matrix3F covariance = ComputeColorCovariance(bitmap);
+  gfx::Matrix3F covariance = ComputeColorCovariance(canvas.ToBitmap());
 
   gfx::Matrix3F expected_covariance = gfx::Matrix3F::Zeros();
   expected_covariance.set(2400, 400, -1600,
@@ -403,7 +402,7 @@ TEST_F(ColorAnalysisTest, ApplyColorReductionBlackAndWhite) {
   // The image consists of vertical non-overlapping stripes 150 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 150, 200), SkColorSetRGB(0, 0, 0));
   canvas.FillRect(gfx::Rect(150, 0, 150, 200), SkColorSetRGB(255, 255, 255));
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap result;
   result.allocPixels(SkImageInfo::MakeA8(300, 200));
 
@@ -440,7 +439,7 @@ TEST_F(ColorAnalysisTest, ApplyColorReductionMultiColor) {
   canvas.FillRect(gfx::Rect(0, 0, 100, 200), SkColorSetRGB(100, 0, 0));
   canvas.FillRect(gfx::Rect(100, 0, 100, 200), SkColorSetRGB(0, 255, 0));
   canvas.FillRect(gfx::Rect(200, 0, 100, 200), SkColorSetRGB(0, 0, 128));
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap result;
   result.allocPixels(SkImageInfo::MakeA8(300, 200));
 
@@ -482,7 +481,7 @@ TEST_F(ColorAnalysisTest, ComputePrincipalComponentImage) {
   canvas.FillRect(gfx::Rect(0, 0, 100, 200), SkColorSetRGB(10, 10, 10));
   canvas.FillRect(gfx::Rect(100, 0, 100, 200), SkColorSetRGB(100, 100, 100));
   canvas.FillRect(gfx::Rect(200, 0, 100, 200), SkColorSetRGB(255, 255, 255));
-  SkBitmap source = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap source = canvas.ToBitmap();
   SkBitmap result;
   result.allocPixels(SkImageInfo::MakeA8(300, 200));