1 files changed, 9 insertions, 8 deletions

diff --git a/Tools/DumpRenderTree/chromium/DRTTestRunner.h b/Tools/DumpRenderTree/chromium/DRTTestRunner.h
index 60a038a27..ec4778fd5 100644
--- a/Tools/DumpRenderTree/chromium/DRTTestRunner.h
+++ b/Tools/DumpRenderTree/chromium/DRTTestRunner.h
@@ -43,6 +43,7 @@
 #define DRTTestRunner_h
 
 #include "TestRunner/src/TestRunner.h"
+#include "WebTask.h"
 
 class TestShell;
 
@@ -511,7 +512,7 @@ public:
         virtual bool run(TestShell*) = 0;
     };
 
-    TaskList* taskList() { return &m_taskList; }
+    WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
 
     bool shouldStayOnPageAfterHandlingBeforeUnload() const { return m_shouldStayOnPageAfterHandlingBeforeUnload; }
 
@@ -534,17 +535,17 @@ private:
 
         void setFrozen(bool frozen) { m_frozen = frozen; }
         bool isEmpty() { return m_queue.isEmpty(); }
-        TaskList* taskList() { return &m_taskList; }
+        WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
 
     private:
         void processWork();
-        class WorkQueueTask: public MethodTask<WorkQueue> {
+        class WorkQueueTask: public WebTestRunner::WebMethodTask<WorkQueue> {
         public:
-            WorkQueueTask(WorkQueue* object): MethodTask<WorkQueue>(object) { }
+            WorkQueueTask(WorkQueue* object): WebTestRunner::WebMethodTask<WorkQueue>(object) { }
             virtual void runIfValid() { m_object->processWork(); }
         };
 
-        TaskList m_taskList;
+        WebTestRunner::WebTaskList m_taskList;
         Deque<WorkItem*> m_queue;
         bool m_frozen;
         DRTTestRunner* m_controller;
@@ -558,9 +559,9 @@ private:
 
     void logErrorToConsole(const std::string&);
     void completeNotifyDone(bool isTimeout);
-    class NotifyDoneTimedOutTask: public MethodTask<DRTTestRunner> {
+    class NotifyDoneTimedOutTask: public WebTestRunner::WebMethodTask<DRTTestRunner> {
     public:
-        NotifyDoneTimedOutTask(DRTTestRunner* object): MethodTask<DRTTestRunner>(object) { }
+        NotifyDoneTimedOutTask(DRTTestRunner* object): WebTestRunner::WebMethodTask<DRTTestRunner>(object) { }
         virtual void runIfValid() { m_object->completeNotifyDone(true); }
     };
 
@@ -571,7 +572,7 @@ private:
     int numberOfActiveAnimations();
 
     // Used for test timeouts.
-    TaskList m_taskList;
+    WebTestRunner::WebTaskList m_taskList;
 
     // Non-owning pointer. The DRTTestRunner is owned by the host.
     TestShell* m_shell;