Index: chrome/browser/thumbnails/content_analysis_unittest.cc |
diff --git a/chrome/browser/thumbnails/content_analysis_unittest.cc b/chrome/browser/thumbnails/content_analysis_unittest.cc |
index 325615e42fb80bb93201d80ea673af1c91f5908d..6d44d14587926f3478cea4df98642276532a9024 100644 |
--- a/chrome/browser/thumbnails/content_analysis_unittest.cc |
+++ b/chrome/browser/thumbnails/content_analysis_unittest.cc |
@@ -88,7 +88,7 @@ TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnImpulse) { |
canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetRGB(10, 10, 10)); |
canvas.FillRect(gfx::Rect(400, 300, 1, 1), SkColorSetRGB(255, 255, 255)); |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap reduced_color; |
reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(), |
@@ -131,7 +131,7 @@ TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnFrame) { |
canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetRGB(0, 0, 0)); |
canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255)); |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap reduced_color; |
reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(), |
@@ -169,7 +169,7 @@ TEST_F(ThumbnailContentAnalysisTest, ExtractImageProfileInformation) { |
canvas.FillRect(image_rect, SkColorSetRGB(0, 0, 0)); |
canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255)); |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap reduced_color; |
reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(), |
source.height())); |
@@ -232,7 +232,7 @@ TEST_F(ThumbnailContentAnalysisTest, |
canvas.DrawRect(gfx::Rect(300, 250, 99, 100), SkColorSetRGB(255, 255, 255)); |
canvas.DrawRect(gfx::Rect(401, 250, 99, 100), SkColorSetRGB(255, 255, 255)); |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap reduced_color; |
reduced_color.allocPixels(SkImageInfo::MakeA8(source.width(), |
source.height())); |
@@ -554,7 +554,7 @@ TEST_F(ThumbnailContentAnalysisTest, ComputeDecimatedImage) { |
std::fill_n(columns.begin() + 300, 100, true); |
std::fill_n(columns.begin() + 500, 100, true); |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap result = ComputeDecimatedImage(source, rows, columns); |
EXPECT_FALSE(result.empty()); |
EXPECT_EQ(300, result.width()); |
@@ -666,7 +666,7 @@ TEST_F(ThumbnailContentAnalysisTest, CreateRetargetedThumbnailImage) { |
canvas.DrawRect(pict_rect, SkColorSetRGB(0, 0, 0)); |
} |
- SkBitmap source = canvas.ToBitmap(); |
+ SkBitmap source = canvas.GetBitmap(); |
SkBitmap result = CreateRetargetedThumbnailImage( |
source, gfx::Size(424, 264), 2.5); |