cc: Generalize raster task notifications

cc/resources/raster_worker_pool_unittest.cc

Index: cc/resources/raster_worker_pool_unittest.cc
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 172d0873cbff9815f8a965551d2b6faa3396b1be..c0ef2c9ff0123a24ac5a185888c710d4ba6491ed 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -109,6 +109,12 @@ class RasterWorkerPoolTest
 
   typedef std::vector<scoped_refptr<RasterTask> > RasterTaskVector;
 
+  enum NamedTaskSet {
+    HIGH_RESOLUTION_IN_NOW_BIN_ON_ACTIVE_TREE = 0,
+    REQUIRED_FOR_ACTIVATION = 1,
+    ALL = 2
+  };
+
   RasterWorkerPoolTest()
       : context_provider_(TestContextProvider::Create()),
         timeout_seconds_(5),
@@ -173,15 +179,19 @@ class RasterWorkerPoolTest
   }
 
   // Overriden from RasterWorkerPoolClient:
-  virtual bool ShouldForceTasksRequiredForActivationToComplete() const
-      OVERRIDE {
-    return false;
+  virtual void DidFinishRunningTasks(TaskSet task_set) OVERRIDE {
+    if (task_set == ALL) {
+      raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
+      base::MessageLoop::current()->Quit();
+    }
   }
-  virtual void DidFinishRunningTasks() OVERRIDE {
-    raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
-    base::MessageLoop::current()->Quit();
+  virtual TaskSetCollection TasksThatShouldBeForcedToComplete() const OVERRIDE {
+    return TaskSetCollection();
+  }
+  virtual base::debug::TraceEventSyntheticDelay* SyntheticDelayForTasks(
+      TaskSet task_set) const OVERRIDE {
+    return NULL;
   }
-  virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE {}
 
   void RunMessageLoopUntilAllTasksHaveCompleted() {
     if (timeout_seconds_) {
@@ -205,8 +215,12 @@ class RasterWorkerPoolTest
 
     for (RasterTaskVector::const_iterator it = tasks_.begin();
          it != tasks_.end();
-         ++it)
-      queue.items.push_back(RasterTaskQueue::Item(it->get(), false));
+         ++it) {
+      TaskSetCollection task_set_collection;
+      task_set_collection[ALL] = true;
+      queue.items.push_back(
+          RasterTaskQueue::Item(it->get(), task_set_collection));
+    }
 
     raster_worker_pool_->AsRasterizer()->ScheduleTasks(&queue);
   }