Plumb PaintImage to the PictureImageLayer.

cc/trees/layer_tree_host_pixeltest_blending.cc

Index: cc/trees/layer_tree_host_pixeltest_blending.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_blending.cc b/cc/trees/layer_tree_host_pixeltest_blending.cc
index 05f94594ae4fa67f13f81deed924f925fead6687..c39314ef3c06d243228074ff41e8749265c4142e 100644
--- a/cc/trees/layer_tree_host_pixeltest_blending.cc
+++ b/cc/trees/layer_tree_host_pixeltest_blending.cc
@@ -6,6 +6,7 @@
 
 #include "cc/layers/picture_image_layer.h"
 #include "cc/layers/solid_color_layer.h"
+#include "cc/paint/paint_image.h"
 #include "cc/test/layer_tree_pixel_resource_test.h"
 #include "cc/test/pixel_comparator.h"
 #include "third_party/skia/include/core/SkImage.h"
@@ -145,7 +146,9 @@ class LayerTreeHostBlendingPixelTest : public LayerTreeHostPixelResourceTest {
     scoped_refptr<PictureImageLayer> layer = PictureImageLayer::Create();
     layer->SetIsDrawable(true);
     layer->SetBounds(gfx::Size(width, height));
-    layer->SetImage(backing_store->makeImageSnapshot());
+    layer->SetImage(PaintImage(backing_store->makeImageSnapshot(),
+                               PaintImage::AnimationType::STATIC,
+                               PaintImage::CompletionState::DONE));
     return layer;
   }
 
@@ -167,7 +170,9 @@ class LayerTreeHostBlendingPixelTest : public LayerTreeHostPixelResourceTest {
                                       bounds.width() - kMaskOffset * 2,
                                       bounds.height() - kMaskOffset * 2),
                      paint);
-    mask->SetImage(surface->makeImageSnapshot());
+    mask->SetImage(PaintImage(surface->makeImageSnapshot(),
+                              PaintImage::AnimationType::STATIC,
+                              PaintImage::CompletionState::DONE));
     layer->SetMaskLayer(mask.get());
   }