Rename paint data structures

cc/layers/picture_layer.cc

Index: cc/layers/picture_layer.cc
diff --git a/cc/layers/picture_layer.cc b/cc/layers/picture_layer.cc
index 625fca6378fb8ae76bf27f302e0660adaf98286c..87bb2d3f7f8191bc85d8ef5ca27118c4f02314be 100644
--- a/cc/layers/picture_layer.cc
+++ b/cc/layers/picture_layer.cc
@@ -8,10 +8,10 @@
 #include "base/trace_event/trace_event.h"
 #include "cc/layers/content_layer_client.h"
 #include "cc/layers/picture_layer_impl.h"
+#include "cc/paint/paint_record.h"
 #include "cc/playback/recording_source.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
@@ -141,10 +141,10 @@ void PictureLayer::SetIsMask(bool is_mask) {
   is_mask_ = is_mask;
 }
 
-sk_sp<SkPicture> PictureLayer::GetPicture() const {
+sk_sp<PaintRecord> PictureLayer::GetPicture() const {
   // We could either flatten the RecordingSource into a single
-  // SkPicture, or paint a fresh one depending on what we intend to do with the
-  // picture. For now we just paint a fresh one to get consistent results.
+  // PaintRecord, or paint a fresh one depending on what we intend to do with
+  // the record. For now we just paint a fresh one to get consistent results.
   if (!DrawsContent())
     return nullptr;