Remove uses of skia::ReadPixels(PaintCanvas)

chrome/browser/thumbnails/simple_thumbnail_crop_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.
 
 #include "chrome/browser/thumbnails/simple_thumbnail_crop.h"
 
 #include "chrome/browser/thumbnails/thumbnailing_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
 #include "skia/ext/platform_canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/surface/transport_dib.h"
 
 using content::WebContents;
 using thumbnails::SimpleThumbnailCrop;
 
 typedef testing::Test SimpleThumbnailCropTest;
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_TallerThanWide) {
   // The input bitmap is vertically long.
   gfx::Canvas canvas(gfx::Size(40, 90), 1.0f, true);
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
 
   // The desired size is square.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was taller than wide.
   EXPECT_EQ(thumbnails::CLIP_RESULT_TALLER_THAN_WIDE, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_WiderThanTall) {
   // The input bitmap is horizontally long.
   gfx::Canvas canvas(gfx::Size(70, 40), 1.0f, true);
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
 
   // The desired size is square.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was wider than tall.
   EXPECT_EQ(thumbnails::CLIP_RESULT_WIDER_THAN_TALL, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_TooWiderThanTall) {
   // The input bitmap is horizontally very long.
   gfx::Canvas canvas(gfx::Size(90, 40), 1.0f, true);
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
 
   // The desired size is square.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was wider than tall.
   EXPECT_EQ(thumbnails::CLIP_RESULT_MUCH_WIDER_THAN_TALL, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_NotClipped) {
   // The input bitmap is square.
   gfx::Canvas canvas(gfx::Size(40, 40), 1.0f, true);
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
 
   // The desired size is square.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // There was no need to clip.
   EXPECT_EQ(thumbnails::CLIP_RESULT_NOT_CLIPPED, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_NonSquareOutput) {
   // The input bitmap is square.
   gfx::Canvas canvas(gfx::Size(40, 40), 1.0f, true);
-  SkBitmap bitmap = skia::ReadPixels(canvas.sk_canvas());
+  SkBitmap bitmap = canvas.ToBitmap();
 
   // The desired size is horizontally long.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::GetClippedBitmap(
       bitmap, 20, 10, &clip_result);
   // The clipped bitmap should have the same aspect ratio of the desired size.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(20, clipped_bitmap.height());
   // The input was taller than wide.
   EXPECT_EQ(thumbnails::CLIP_RESULT_TALLER_THAN_WIDE, clip_result);
@@ skipping 107 matching lines @@
   EXPECT_LT(0, clip_rect.x());
   EXPECT_GE(2000, clip_rect.width());
   EXPECT_EQ(800, clip_rect.height());
 
   clip_rect = SimpleThumbnailCrop::GetClippingRect(
       gfx::Size(900, 600), desired_size, &clip_result);
   EXPECT_EQ(thumbnails::CLIP_RESULT_NOT_CLIPPED, clip_result);
   EXPECT_EQ(gfx::Point(0, 0).ToString(), clip_rect.origin().ToString());
   EXPECT_EQ(gfx::Size(900, 600).ToString(), clip_rect.size().ToString());
 }