Rename paint data structures

cc/playback/image_hijack_canvas_unittest.cc

Index: cc/playback/image_hijack_canvas_unittest.cc
diff --git a/cc/playback/image_hijack_canvas_unittest.cc b/cc/playback/image_hijack_canvas_unittest.cc
index 76186eead97d8e7971eb0cf7da9bcc753d1617a4..274cba36bbcee7c3ce0e141411eaa01ae2c9a301 100644
--- a/cc/playback/image_hijack_canvas_unittest.cc
+++ b/cc/playback/image_hijack_canvas_unittest.cc
@@ -44,12 +44,12 @@ TEST(ImageHijackCanvasTest, NonLazyImagesSkipped) {
   bitmap.allocN32Pixels(10, 10, true);
   sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap);
 
-  SkPaint paint;
+  PaintFlags paint;
   canvas.drawImage(image, 0, 0, &paint);
   canvas.drawImageRect(image, SkRect::MakeXYWH(0, 0, 10, 10),
                        SkRect::MakeXYWH(10, 10, 10, 10), &paint);
 
-  SkPaint image_paint;
+  PaintFlags image_paint;
   image_paint.setShader(
       image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode));
   SkRect paint_rect = SkRect::MakeXYWH(0, 0, 100, 100);