Rename paint data structures

cc/playback/display_item.h

Index: cc/playback/display_item.h
diff --git a/cc/playback/display_item.h b/cc/playback/display_item.h
index 4e74e9079e76e9f9da7c3400aba25af25a49ff99..2f315f78bd9ad8a2fb5f8844dac6bb8cda8cbef2 100644
--- a/cc/playback/display_item.h
+++ b/cc/playback/display_item.h
@@ -11,11 +11,10 @@
 
 #include "cc/base/cc_export.h"
 #include "cc/debug/traced_value.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_record.h"
 #include "ui/gfx/geometry/rect.h"
 
-class SkCanvas;
-
 namespace cc {
 
 namespace proto {
@@ -43,9 +42,9 @@ class CC_EXPORT DisplayItem {
   virtual ~DisplayItem() {}
 
   virtual void ToProtobuf(proto::DisplayItem* proto) const = 0;
-  virtual sk_sp<const SkPicture> GetPicture() const;
-  virtual void Raster(SkCanvas* canvas,
-                      SkPicture::AbortCallback* callback) const = 0;
+  virtual sk_sp<const PaintRecord> GetPicture() const;
+  virtual void Raster(PaintCanvas* canvas,
+                      PaintRecord::AbortCallback* callback) const = 0;
   virtual void AsValueInto(const gfx::Rect& visual_rect,
                            base::trace_event::TracedValue* array) const = 0;