Index: ui/gfx/nine_image_painter_unittest.cc |
diff --git a/ui/gfx/nine_image_painter_unittest.cc b/ui/gfx/nine_image_painter_unittest.cc |
index 954f97ac8c2d0ddb49e5e511f7a7c94f8ad17045..1cf8506291ae27dff9cb9b44629b6bfa05970c98 100644 |
--- a/ui/gfx/nine_image_painter_unittest.cc |
+++ b/ui/gfx/nine_image_painter_unittest.cc |
@@ -85,7 +85,7 @@ TEST(NineImagePainterTest, PaintHighDPI) { |
gfx::Rect bounds(0, 0, 50, 50); |
painter.Paint(&canvas, bounds); |
- SkBitmap result = canvas.ToBitmap(); |
+ SkBitmap result = canvas.GetBitmap(); |
gfx::Vector2d paint_offset = |
gfx::ToFlooredVector2d(gfx::ScaleVector2d(offset, image_scale)); |
@@ -116,7 +116,7 @@ TEST(NineImagePainterTest, PaintStaysInBounds) { |
gfx::Rect bounds(1, 1, 1, 1); |
painter.Paint(&canvas, bounds); |
- SkBitmap result = canvas.ToBitmap(); |
+ SkBitmap result = canvas.GetBitmap(); |
EXPECT_EQ(SK_ColorGREEN, result.getColor(1, 1)); |
@@ -146,7 +146,7 @@ TEST(NineImagePainterTest, PaintWithBoundOffset) { |
gfx::Rect bounds(1, 1, 10, 10); |
painter.Paint(&canvas, bounds); |
- SkBitmap result = canvas.ToBitmap(); |
+ SkBitmap result = canvas.GetBitmap(); |
SkIRect green_rect = SkIRect::MakeLTRB(2, 2, 10, 10); |
for (int y = 1; y < 10; y++) { |
@@ -182,7 +182,7 @@ TEST(NineImagePainterTest, PaintWithScale) { |
gfx::Rect bounds(0, 0, 50, 50); |
painter.Paint(&canvas, bounds); |
- SkBitmap result = canvas.ToBitmap(); |
+ SkBitmap result = canvas.GetBitmap(); |
gfx::Vector2d paint_offset = |
gfx::ToFlooredVector2d(gfx::ScaleVector2d(offset, image_scale)); |
@@ -211,7 +211,7 @@ TEST(NineImagePainterTest, PaintWithNegativeScale) { |
gfx::Rect bounds(0, 0, 50, 50); |
painter.Paint(&canvas, bounds); |
- SkBitmap result = canvas.ToBitmap(); |
+ SkBitmap result = canvas.GetBitmap(); |
// The painting space is 50x50 and the scale of -1,-1 means an offset of 50,50 |
// would put the output in the top left corner. Since the offset is 70,60 it |