Rename paint data structures

cc/trees/layer_tree_host_pixeltest_tiles.cc

Index: cc/trees/layer_tree_host_pixeltest_tiles.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_tiles.cc b/cc/trees/layer_tree_host_pixeltest_tiles.cc
index 058eb5474ed56ccb50be0c833fc8e431d01b826a..304cd36fb517f50a6adc986ce88873393408ee30 100644
--- a/cc/trees/layer_tree_host_pixeltest_tiles.cc
+++ b/cc/trees/layer_tree_host_pixeltest_tiles.cc
@@ -7,14 +7,15 @@
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/output/copy_output_request.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
+#include "cc/paint/paint_recorder.h"
 #include "cc/playback/display_item_list.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/test/layer_tree_pixel_test.h"
 #include "cc/test/test_compositor_frame_sink.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
-#include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 
 #if !defined(OS_ANDROID)
 
@@ -116,8 +117,8 @@ class BlueYellowClient : public ContentLayerClient {
     scoped_refptr<DisplayItemList> display_list =
         DisplayItemList::Create(settings);
 
-    SkPictureRecorder recorder;
-    SkCanvas* canvas =
+    PaintRecorder recorder;
+    PaintCanvas* canvas =
         recorder.beginRecording(gfx::RectToSkRect(gfx::Rect(size_)));
     gfx::Rect top(0, 0, size_.width(), size_.height() / 2);
     gfx::Rect bottom(0, size_.height() / 2, size_.width(), size_.height() / 2);
@@ -125,8 +126,8 @@ class BlueYellowClient : public ContentLayerClient {
     gfx::Rect blue_rect = blue_top_ ? top : bottom;
     gfx::Rect yellow_rect = blue_top_ ? bottom : top;
 
-    SkPaint paint;
-    paint.setStyle(SkPaint::kFill_Style);
+    PaintFlags paint;
+    paint.setStyle(PaintFlags::kFill_Style);
 
     paint.setColor(SK_ColorBLUE);
     canvas->drawRect(gfx::RectToSkRect(blue_rect), paint);