cc: Keep PaintImage in DrawImage.

cc/trees/layer_tree_host_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 12312 matching lines @@
 TEST_F(LayerTreeHostImplTest, CheckerImagingTileInvalidation) {
   LayerTreeSettings settings = DefaultSettings();
   settings.enable_checker_imaging = true;
   settings.default_tile_size = gfx::Size(256, 256);
   settings.max_untiled_layer_size = gfx::Size(256, 256);
   CreateHostImpl(settings, CreateCompositorFrameSink());
   gfx::Size layer_size = gfx::Size(750, 750);
 
   std::unique_ptr<FakeRecordingSource> recording_source =
       FakeRecordingSource::CreateFilledRecordingSource(layer_size);
-  sk_sp<SkImage> checkerable_image =
-      CreateDiscardableImage(gfx::Size(500, 500));
+  PaintImage checkerable_image = PaintImage(
+      PaintImage::GetNextId(), CreateDiscardableImage(gfx::Size(500, 500)));
   recording_source->add_draw_image(checkerable_image, gfx::Point(0, 0));
 
   SkColor non_solid_color = SkColorSetARGB(128, 45, 56, 67);
   PaintFlags non_solid_flags;
   non_solid_flags.setColor(non_solid_color);
   recording_source->add_draw_rect_with_flags(gfx::Rect(510, 0, 200, 600),
                                              non_solid_flags);
   recording_source->add_draw_rect_with_flags(gfx::Rect(0, 510, 200, 400),
                                              non_solid_flags);
   recording_source->Rerecord();
@@ skipping 39 matching lines @@
   host_impl_->InvalidateContentOnImplSide();
   pending_tree = host_impl_->pending_tree();
   root = static_cast<FakePictureLayerImpl*>(*pending_tree->begin());
   for (auto* tile : root->tilings()->tiling_at(0)->AllTilesForTesting()) {
     if (tile->tiling_i_index() < 2 && tile->tiling_j_index() < 2)
       EXPECT_TRUE(tile->HasRasterTask());
     else
       EXPECT_FALSE(tile->HasRasterTask());
   }
   Region expected_invalidation(
-      raster_source->GetRectForImage(checkerable_image->uniqueID()));
+      raster_source->GetRectForImage(checkerable_image.stable_id()));
   EXPECT_EQ(expected_invalidation, *(root->GetPendingInvalidation()));
 }
 
 }  // namespace
 }  // namespace cc