Improving flat containers interface.

cc/tiles/checker_image_tracker_unittest.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 "cc/tiles/checker_image_tracker.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 295 matching lines @@
 
   CheckerImageTracker::ImageDecodeQueue image_decode_queue;
   image_decode_queue =
       BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE);
   EXPECT_EQ(image_decode_queue.size(), 2U);
   checker_image_tracker_->ScheduleImageDecodeQueue(
       std::move(image_decode_queue));
 
   // Only the first image in the queue should have been decoded.
   EXPECT_EQ(image_controller_.decodes_requested().size(), 1U);
-  EXPECT_EQ(image_controller_.decodes_requested().count(
-                checkerable_image1.image()->uniqueID()),
-            1U);
+  EXPECT_EQ(
+      image_controller_.decodes_requested().count(
+          static_cast<PaintImage::Id>(checkerable_image1.image()->uniqueID())),
+      1U);
 
   // Rebuild the queue before the tracker is notified of decode completion,
   // removing the second image and adding a new one.
   DrawImage checkerable_image3 = CreateImage(ImageType::CHECKERABLE);
   draw_images = {checkerable_image1, checkerable_image3};
   image_decode_queue =
       BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE);
 
   // The queue has 2 decodes because we are still checkering on the first one.
   EXPECT_EQ(image_decode_queue.size(), 2U);
   checker_image_tracker_->ScheduleImageDecodeQueue(
       std::move(image_decode_queue));
 
   // We still have only one decode because the tracker keeps only one decode
   // pending at a time.
   EXPECT_EQ(image_controller_.decodes_requested().size(), 1U);
-  EXPECT_EQ(image_controller_.decodes_requested().count(
-                checkerable_image1.image()->uniqueID()),
-            1U);
+  EXPECT_EQ(
+      image_controller_.decodes_requested().count(
+          static_cast<PaintImage::Id>(checkerable_image1.image()->uniqueID())),
+      1U);
 
   // Trigger completion for all decodes. Only 2 images should have been decoded
   // since the second image was cancelled.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(image_controller_.decodes_requested().size(), 2U);
-  EXPECT_EQ(image_controller_.decodes_requested().count(
-                checkerable_image3.image()->uniqueID()),
-            1U);
+  EXPECT_EQ(
+      image_controller_.decodes_requested().count(
+          static_cast<PaintImage::Id>(checkerable_image3.image()->uniqueID())),
+      1U);
   EXPECT_EQ(image_controller_.num_of_locked_images(), 2);
 }
 
 TEST_F(CheckerImageTrackerTest, ClearsTracker) {
   SetUpTracker(true);
 
   DrawImage checkerable_image = CreateImage(ImageType::CHECKERABLE);
   CheckerImageTracker::ImageDecodeQueue image_decode_queue =
       BuildImageDecodeQueue({checkerable_image}, WhichTree::PENDING_TREE);
   EXPECT_EQ(image_decode_queue.size(), 1U);
@@ skipping 170 matching lines @@
       CheckerImageTracker::DecodeType::kPreDecode);
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(image_controller_.decoded_images()[0], image1);
   EXPECT_EQ(image_controller_.decoded_images()[1], image2);
   EXPECT_EQ(image_controller_.decoded_images()[2], image3);
   EXPECT_EQ(image_controller_.decoded_images()[3], image4);
 }
 
 }  // namespace
 }  // namespace cc