cc: Keep PaintImage in DrawImage.

cc/test/fake_content_layer_client.h

Index: cc/test/fake_content_layer_client.h
diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h
index b644087e5198ae82deb740437cacaf8c7ab65d92..5849cb1a31e930d83ab3da8526df9d5d8f886629 100644
--- a/cc/test/fake_content_layer_client.h
+++ b/cc/test/fake_content_layer_client.h
@@ -24,15 +24,15 @@ namespace cc {
 class FakeContentLayerClient : public ContentLayerClient {
  public:
   struct ImageData {
-    ImageData(sk_sp<SkImage> image,
+    ImageData(PaintImage image,
               const gfx::Point& point,
               const PaintFlags& flags);
-    ImageData(sk_sp<SkImage> image,
+    ImageData(PaintImage image,
               const gfx::Transform& transform,
               const PaintFlags& flags);
     ImageData(const ImageData& other);
     ~ImageData();
-    sk_sp<SkImage> image;
+    PaintImage image;
     gfx::Point point;
     gfx::Transform transform;
     PaintFlags flags;
@@ -62,6 +62,12 @@ class FakeContentLayerClient : public ContentLayerClient {
   void add_draw_image(sk_sp<SkImage> image,
                       const gfx::Point& point,
                       const PaintFlags& flags) {
+    add_draw_image(PaintImage(PaintImage::GetNextId(), std::move(image)), point,
+                   flags);
+  }
+  void add_draw_image(PaintImage image,
+                      const gfx::Point& point,
+                      const PaintFlags& flags) {
     ImageData data(std::move(image), point, flags);
     draw_images_.push_back(data);
   }
@@ -69,7 +75,8 @@ class FakeContentLayerClient : public ContentLayerClient {
   void add_draw_image_with_transform(sk_sp<SkImage> image,
                                      const gfx::Transform& transform,
                                      const PaintFlags& flags) {
-    ImageData data(std::move(image), transform, flags);
+    ImageData data(PaintImage(PaintImage::GetNextId(), std::move(image)),
+                   transform, flags);
     draw_images_.push_back(data);
   }