Introduce WebTaskRunner Patch 3/5

Source/platform/scheduler/CancellableTaskFactoryTest.cpp

Index: Source/platform/scheduler/CancellableTaskFactoryTest.cpp
diff --git a/Source/platform/scheduler/CancellableTaskFactoryTest.cpp b/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
index dbb1e9a182f69afd8476c6a2bd6ddb0252986f94..02713cd17a0e7cab484788e156d4a840ba577d64 100644
--- a/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
+++ b/Source/platform/scheduler/CancellableTaskFactoryTest.cpp
@@ -21,7 +21,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskNotCreated)
 TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreated)
 {
     CancellableTaskFactory factory(nullptr);
-    OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
 
     EXPECT_TRUE(factory.isPending());
 }
@@ -34,7 +34,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndRun)
 {
     CancellableTaskFactory factory(WTF::bind(&EmptyFn));
     {
-        OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+        OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
         task->run();
     }
 
@@ -52,7 +52,7 @@ TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndDestroyed)
 TEST_F(CancellableTaskFactoryTest, IsPending_TaskCreatedAndCancelled)
 {
     CancellableTaskFactory factory(nullptr);
-    OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
     factory.cancel();
 
     EXPECT_FALSE(factory.isPending());
@@ -76,7 +76,7 @@ public:
 TEST_F(CancellableTaskFactoryTest, IsPending_InCallback)
 {
     TestClass testClass;
-    OwnPtr<WebThread::Task> task = adoptPtr(testClass.m_factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(testClass.m_factory.cancelAndCreate());
     task->run();
 }
 
@@ -89,7 +89,7 @@ TEST_F(CancellableTaskFactoryTest, Run_ClosureIsExecuted)
 {
     int executionCount = 0;
     CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
-    OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
     task->run();
 
     EXPECT_EQ(1, executionCount);
@@ -99,7 +99,7 @@ TEST_F(CancellableTaskFactoryTest, Run_ClosureIsExecutedOnlyOnce)
 {
     int executionCount = 0;
     CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
-    OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
     task->run();
     task->run();
     task->run();
@@ -111,7 +111,7 @@ TEST_F(CancellableTaskFactoryTest, Run_ClosureIsExecutedOnlyOnce)
 TEST_F(CancellableTaskFactoryTest, Run_FactoryDestructionPreventsExecution)
 {
     int executionCount = 0;
-    OwnPtr<WebThread::Task> task;
+    OwnPtr<WebTaskRunner::Task> task;
     {
         CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
         task = adoptPtr(factory.cancelAndCreate());
@@ -126,15 +126,15 @@ TEST_F(CancellableTaskFactoryTest, Run_TasksInSequence)
     int executionCount = 0;
     CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
 
-    OwnPtr<WebThread::Task> taskA = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> taskA = adoptPtr(factory.cancelAndCreate());
     taskA->run();
     EXPECT_EQ(1, executionCount);
 
-    OwnPtr<WebThread::Task> taskB = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> taskB = adoptPtr(factory.cancelAndCreate());
     taskB->run();
     EXPECT_EQ(2, executionCount);
 
-    OwnPtr<WebThread::Task> taskC = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> taskC = adoptPtr(factory.cancelAndCreate());
     taskC->run();
     EXPECT_EQ(3, executionCount);
 }
@@ -143,7 +143,7 @@ TEST_F(CancellableTaskFactoryTest, Cancel)
 {
     int executionCount = 0;
     CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
-    OwnPtr<WebThread::Task> task = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> task = adoptPtr(factory.cancelAndCreate());
     factory.cancel();
     task->run();
 
@@ -155,8 +155,8 @@ TEST_F(CancellableTaskFactoryTest, CreatingANewTaskCancelsPreviousOnes)
     int executionCount = 0;
     CancellableTaskFactory factory(WTF::bind(&AddOne, &executionCount));
 
-    OwnPtr<WebThread::Task> taskA = adoptPtr(factory.cancelAndCreate());
-    OwnPtr<WebThread::Task> taskB = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> taskA = adoptPtr(factory.cancelAndCreate());
+    OwnPtr<WebTaskRunner::Task> taskB = adoptPtr(factory.cancelAndCreate());
 
     taskA->run();
     EXPECT_EQ(0, executionCount);