cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread().

cc/tiles/tile_manager_unittest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 1701 matching lines @@
   // The first task to run should be ReadyToDraw (this should not be blocked by
   // the tasks required for activation).
   base::RunLoop run_loop;
   EXPECT_CALL(MockHostImpl(), NotifyReadyToDraw())
       .WillOnce(testing::Invoke([&run_loop]() { run_loop.Quit(); }));
   static_cast<SynchronousTaskGraphRunner*>(task_graph_runner())
       ->RunSingleTaskForTesting();
   run_loop.Run();
 }
 
-// Fake TileTaskManager that just cancels all scheduled tasks immediately.
-class CancellingTileTaskManager : public FakeTileTaskManagerImpl {
- public:
-  CancellingTileTaskManager() {}
-  ~CancellingTileTaskManager() override {}
-
-  void ScheduleTasks(TaskGraph* graph) override {
-    // Just call CompleteOnOriginThread on each item in the queue. As none of
-    // these items have run yet, they will be treated as cancelled tasks.
-    for (const auto& node : graph->nodes) {
-      static_cast<TileTask*>(node.task)->CompleteOnOriginThread(
-          raster_buffer_provider_.get());
-    }
-  }
-  void CheckForCompletedTasks() override {}
-};
-
 class PartialRasterTileManagerTest : public TileManagerTest {
  public:
   LayerTreeSettings CreateSettings() override {
     LayerTreeSettings settings = TileManagerTest::CreateSettings();
     settings.use_partial_raster = true;
     return settings;
   }
 };
 
 // Ensures that if a raster task is cancelled, it gets returned to the resource
 // pool with an invalid content ID, not with its invalidated content ID.
 TEST_F(PartialRasterTileManagerTest, CancelledTasksHaveNoContentId) {
-  // Create a CancellingTaskRunner and set it on the tile manager so that all
+  // Create a FakeTileTaskManagerImpl and set it on the tile manager so that all
   // scheduled work is immediately cancelled.
-  CancellingTileTaskManager cancelling_task_manager;
-  host_impl()->tile_manager()->SetTileTaskManagerForTesting(
-      &cancelling_task_manager);
+
+  FakeTileTaskManagerImpl tile_task_manager;
+  host_impl()->tile_manager()->SetTileTaskManagerForTesting(&tile_task_manager);
 
   // Pick arbitrary IDs - they don't really matter as long as they're constant.
   const int kLayerId = 7;
   const uint64_t kInvalidatedId = 43;
   const gfx::Size kTileSize(128, 128);
 
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(kTileSize);
   host_impl()->CreatePendingTree();
   LayerTreeImpl* pending_tree = host_impl()->pending_tree();
@@ skipping 13 matching lines @@
   host_impl()->pending_tree()->BuildPropertyTreesForTesting();
   host_impl()->pending_tree()->UpdateDrawProperties(
       false /* update_lcd_text */);
 
   // Build the raster queue and invalidate the top tile.
   std::unique_ptr<RasterTilePriorityQueue> queue(host_impl()->BuildRasterQueue(
       SAME_PRIORITY_FOR_BOTH_TREES, RasterTilePriorityQueue::Type::ALL));
   EXPECT_FALSE(queue->IsEmpty());
   queue->Top().tile()->SetInvalidated(gfx::Rect(), kInvalidatedId);
 
-  // PrepareTiles to schedule tasks. Due to the CancellingTileTaskManager,
+  // PrepareTiles to schedule tasks. Due to the FakeTileTaskManagerImpl,
   // these tasks will immediately be canceled.
   host_impl()->tile_manager()->PrepareTiles(host_impl()->global_tile_state());
 
   // Make sure that the tile we invalidated above was not returned to the pool
   // with its invalidated resource ID.
   host_impl()->resource_pool()->CheckBusyResources();
   EXPECT_FALSE(host_impl()->resource_pool()->TryAcquireResourceWithContentId(
       kInvalidatedId));
 
-  // Free our host_impl_ before the cancelling_task_manager we passed it, as it
+  // Free our host_impl_ before the tile_task_manager we passed it, as it
   // will use that class in clean up.
   TakeHostImpl();
 }
 
 // FakeRasterBufferProviderImpl that verifies the resource content ID of raster
 // tasks.
 class VerifyResourceContentIdRasterBufferProvider
     : public FakeRasterBufferProviderImpl {
  public:
   explicit VerifyResourceContentIdRasterBufferProvider(
@@ skipping 14 matching lines @@
   uint64_t expected_resource_id_;
 };
 
 class VerifyResourceContentIdTileTaskManager : public FakeTileTaskManagerImpl {
  public:
   explicit VerifyResourceContentIdTileTaskManager(uint64_t expected_resource_id)
       : FakeTileTaskManagerImpl(base::WrapUnique<RasterBufferProvider>(
             new VerifyResourceContentIdRasterBufferProvider(
                 expected_resource_id))) {}
   ~VerifyResourceContentIdTileTaskManager() override {}
-
-  void ScheduleTasks(TaskGraph* graph) override {
-    for (const auto& node : graph->nodes) {
-      TileTask* task = static_cast<TileTask*>(node.task);
-      // Triggers a call to AcquireBufferForRaster.
-      task->ScheduleOnOriginThread(raster_buffer_provider_.get());
-      // Calls TileManager as though task was cancelled.
-      task->CompleteOnOriginThread(raster_buffer_provider_.get());
-    }
-  }
-  void CheckForCompletedTasks() override {}
 };
 
 // Runs a test to ensure that partial raster is either enabled or disabled,
 // depending on |partial_raster_enabled|'s value. Takes ownership of host_impl
 // so that cleanup order can be controlled.
 void RunPartialRasterCheck(std::unique_ptr<LayerTreeHostImpl> host_impl,
                            bool partial_raster_enabled) {
   // Pick arbitrary IDs - they don't really matter as long as they're constant.
   const int kLayerId = 7;
   const uint64_t kInvalidatedId = 43;
@@ skipping 55 matching lines @@
 }
 
 // Ensures that the tile manager does not attempt to reuse tiles when partial
 // raster is disabled.
 TEST_F(TileManagerTest, PartialRasterSuccessfullyDisabled) {
   RunPartialRasterCheck(TakeHostImpl(), false /* partial_raster_enabled */);
 }
 
 }  // namespace
 }  // namespace cc