Revert of cc: Cleanup internal::WorkerPoolTaskClient interface. (https://codereview.chromium.org/170783007/)

Reason for revert:
Speculative revert. Suspecting that this CL may be causing a DCHECK to fire on Android in PixelBufferRasterWorkerPool::ScheduleMoreTasks(

http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/18755/steps/slave_steps/logs/stdio

Original issue's description:
> cc: Cleanup internal::WorkerPoolTaskClient interface.
> 
> ::CompleteOnOriginThread is now called when RasterWorkerPool has
> completed all necessary initialization of resource, including
> texture uploads. This improves the WorkerPoolTask/Client interface
> significantly and will allow better resource recycling once
> ::RunReplyOnOriginThread is removed.
> 
> BUG=269841
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=252790

TBR=vmpstr@chromium.org,alokp@chromium.org,sergeyberezin@chromium.org,reveman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=269841

Review URL: https://codereview.chromium.org/176403002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252807 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 8 deletions

diff --git a/cc/test/fake_tile_manager.cc b/cc/test/fake_tile_manager.cc
index cbd09f2..a0d03df 100644
--- a/cc/test/fake_tile_manager.cc
+++ b/cc/test/fake_tile_manager.cc
@@ -25,8 +25,6 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
          ++it) {
       internal::RasterWorkerPoolTask* task = it->task;
 
-      task->WillSchedule();
-      task->ScheduleOnOriginThread(this);
       task->DidSchedule();
 
       completed_tasks_.push_back(task);
@@ -37,9 +35,7 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
       internal::WorkerPoolTask* task = completed_tasks_.front().get();
 
       task->WillComplete();
-      task->CompleteOnOriginThread(this);
       task->DidComplete();
-
       task->RunReplyOnOriginThread();
 
       completed_tasks_.pop_front();
@@ -53,12 +49,15 @@ class FakeRasterWorkerPool : public RasterWorkerPool {
   }
 
   // Overridden from internal::WorkerPoolTaskClient:
-  virtual SkCanvas* AcquireCanvasForRaster(internal::WorkerPoolTask* task,
-                                           const Resource* resource) OVERRIDE {
+  virtual SkCanvas* AcquireCanvasForRaster(internal::RasterWorkerPoolTask* task)
+      OVERRIDE {
     return NULL;
   }
-  virtual void ReleaseCanvasForRaster(internal::WorkerPoolTask* task,
-                                      const Resource* resource) OVERRIDE {}
+  virtual void OnRasterCompleted(internal::RasterWorkerPoolTask* task,
+                                 const PicturePileImpl::Analysis& analysis)
+      OVERRIDE {}
+  virtual void OnImageDecodeCompleted(internal::WorkerPoolTask* task) OVERRIDE {
+  }
 
  private:
   // Overridden from RasterWorkerPool: