cc: Make image controller return a status with the callback.

cc/tiles/image_controller_unittest.cc

 // Copyright 2016 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/image_controller.h"
 #include "base/bind.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "cc/tiles/image_controller.h"
+#include "cc/test/skia_common.h"
 #include "cc/tiles/image_decode_cache.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class TestWorkerThread : public base::SimpleThread {
  public:
   TestWorkerThread()
       : base::SimpleThread("test_worker_thread"), condition_(&lock_) {}
@@ skipping 104 matching lines @@
  private:
   int number_of_refs_ = 0;
   scoped_refptr<TileTask> task_to_use_;
 };
 
 // A simple class that can receive decode callbacks.
 class DecodeClient {
  public:
   DecodeClient() {}
   void Callback(const base::Closure& quit_closure,
-                ImageController::ImageDecodeRequestId id) {
+                ImageController::ImageDecodeRequestId id,
+                ImageController::ImageDecodeResult result) {
     id_ = id;
     quit_closure.Run();
   }
 
   ImageController::ImageDecodeRequestId id() { return id_; }
 
  private:
   ImageController::ImageDecodeRequestId id_ = 0;
 };
 
@@ skipping 65 matching lines @@
 };
 
 // For tests that exercise image controller's thread, this is the timeout value
 // to
 // allow the worker thread to do its work.
 int kDefaultTimeoutSeconds = 10;
 
 class ImageControllerTest : public testing::Test {
  public:
   ImageControllerTest() : task_runner_(base::SequencedTaskRunnerHandle::Get()) {
-    bitmap_.allocN32Pixels(1, 1);
-    image_ = SkImage::MakeFromBitmap(bitmap_);
+    image_ = CreateDiscardableImage(gfx::Size(1, 1));
   }
   ~ImageControllerTest() override = default;
 
   void SetUp() override {
     worker_task_runner_ = make_scoped_refptr(new WorkerTaskRunner);
     controller_.reset(
         new ImageController(task_runner_.get(), worker_task_runner_));
     cache_ = TestableCache();
     controller_->SetImageDecodeCache(&cache_);
   }
@@ skipping 21 matching lines @@
         base::Bind(&ImageControllerTest::Timeout, base::Unretained(run_loop)),
         base::TimeDelta::FromSeconds(kDefaultTimeoutSeconds));
     run_loop->Run();
   }
 
  private:
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   scoped_refptr<WorkerTaskRunner> worker_task_runner_;
   TestableCache cache_;
   std::unique_ptr<ImageController> controller_;
-  SkBitmap bitmap_;
   sk_sp<const SkImage> image_;
 };
 
 TEST_F(ImageControllerTest, NullControllerUnrefsImages) {
   std::vector<DrawImage> images(10);
   ImageDecodeCache::TracingInfo tracing_info;
 
   ASSERT_EQ(10u, images.size());
   auto tasks =
       controller()->SetPredecodeImages(std::move(images), tracing_info);
@@ skipping 167 matching lines @@
   EXPECT_EQ(expected_id1, decode_client1.id());
   EXPECT_TRUE(task->has_run());
   EXPECT_EQ(1, cache()->number_of_refs());
 
   controller()->SetImageDecodeCache(nullptr);
   EXPECT_EQ(0, cache()->number_of_refs());
 }
 
 }  // namespace
 }  // namespace cc