Rename paint data structures

ui/compositor/paint_context.h

Index: ui/compositor/paint_context.h
diff --git a/ui/compositor/paint_context.h b/ui/compositor/paint_context.h
index 459dccfc059411c634b433f57b640e6484eed37f..b9c51dd386a3dca5caf7daa4d15ea1a541f18511 100644
--- a/ui/compositor/paint_context.h
+++ b/ui/compositor/paint_context.h
@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "cc/paint/paint_recorder.h"
 #include "ui/compositor/compositor_export.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -16,8 +17,6 @@ namespace cc {
 class DisplayItemList;
 }
 
-class SkPictureRecorder;
-
 namespace ui {
 class ClipRecorder;
 class CompositingRecorder;
@@ -86,11 +85,11 @@ class COMPOSITOR_EXPORT PaintContext {
   gfx::Rect ToLayerSpaceRect(const gfx::Rect& rect) const;
 
   cc::DisplayItemList* list_;
-  std::unique_ptr<SkPictureRecorder> owned_recorder_;
+  std::unique_ptr<cc::PaintRecorder> owned_recorder_;
   // A pointer to the |owned_recorder_| in this PaintContext, or in another one
   // which this was copied from. We expect a copied-from PaintContext to outlive
   // copies made from it.
-  SkPictureRecorder* recorder_;
+  cc::PaintRecorder* recorder_;
   // The device scale of the frame being painted. Used to determine which bitmap
   // resources to use in the frame.
   float device_scale_factor_;