cc: Fix a flake in ImageControllerTest.QueueImageDecodeChangeControllerWithTaskQueued

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 "base/threading/thread_checker_impl.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()
@@ skipping 184 matching lines @@
     base::AutoLock hold(lock_);
     can_run_ = true;
     run_cv_.Signal();
   }
 
   bool has_run() { return has_run_; }
 
  private:
   ~BlockingTask() override = default;
 
-  base::ThreadChecker thread_checker_;
+  // Use ThreadCheckerImpl, so that release builds also get correct behavior.
+  base::ThreadCheckerImpl thread_checker_;
   bool has_run_ = false;
   base::Lock lock_;
   base::ConditionVariable run_cv_;
   bool can_run_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(BlockingTask);
 };
 
 // For tests that exercise image controller's thread, this is the timeout value
-// to
-// allow the worker thread to do its work.
+// to allow the worker thread to do its work.
 int kDefaultTimeoutSeconds = 10;
 
 class ImageControllerTest : public testing::Test {
  public:
   ImageControllerTest() : task_runner_(base::SequencedTaskRunnerHandle::Get()) {
     image_ = CreateDiscardableImage(gfx::Size(1, 1));
   }
   ~ImageControllerTest() override = default;
 
   void SetUp() override {
@@ skipping 345 matching lines @@
             decode_client2.result());
 
   // Reset the controller since the order of destruction is wrong in this test
   // (|other_cache| should outlive the controller. This is normally done via
   // SetImageDecodeCache(nullptr) or it can be done in the dtor of the cache.)
   ResetController();
 }
 
 }  // namespace
 }  // namespace cc