cc: Keep PaintImage in DrawImage.

cc/tiles/software_image_decode_cache_perftest.cc

 // Copyright 2017 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 <vector>
 
 #include "cc/base/lap_timer.h"
 #include "cc/paint/draw_image.h"
 #include "cc/raster/tile_task.h"
 #include "cc/tiles/software_image_decode_cache.h"
@@ skipping 38 matching lines @@
         std::make_pair(1.f, 1.f), std::make_pair(0.5f, 0.5f),
         std::make_pair(2.f, 2.f), std::make_pair(0.5f, 1.5f)};
 
     std::vector<DrawImage> images;
     for (auto& quality : qualities) {
       for (auto& rect_subrect : image_rect_subrect) {
         auto& rect = rect_subrect.first;
         auto& subrect = rect_subrect.second;
         for (auto& scale : scales) {
           images.emplace_back(
-              CreateImage(rect.width(), rect.height()), subrect, quality,
+              PaintImage(PaintImage::GetNextId(),
+                         CreateImage(rect.width(), rect.height())),
+              subrect, quality,
               CreateMatrix(SkSize::Make(scale.first, scale.second)),
               gfx::ColorSpace());
         }
       }
     }
 
     timer_.Reset();
     do {
       for (auto& image : images)
         ImageDecodeCacheKey::FromDrawImage(image);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
     perf_test::PrintResult("software_image_decode_cache_fromdrawimage", "",
                            "result", timer_.LapsPerSecond(), "runs/s", true);
   }
 
  private:
   LapTimer timer_;
 };
 
 TEST_F(SoftwareImageDecodeCachePerfTest, FromDrawImage) {
   RunFromImage();
 }
 
 }  // namespace
 }  // namespace cc