1 files changed, 18 insertions, 14 deletions

diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.h b/Tools/DumpRenderTree/chromium/WebViewHost.h
index ba763503a..41237cba9 100644
--- a/Tools/DumpRenderTree/chromium/WebViewHost.h
+++ b/Tools/DumpRenderTree/chromium/WebViewHost.h
@@ -33,13 +33,13 @@
 
 #include "MockSpellCheck.h"
 #include "TestNavigationController.h"
-#include "TestRunner/src/Task.h"
 #include "WebAccessibilityNotification.h"
 #include "WebCursorInfo.h"
 #include "WebFrameClient.h"
 #include "WebIntentRequest.h"
 #include "WebPrerendererClient.h"
 #include "WebSpellCheckClient.h"
+#include "WebTask.h"
 #include "WebTestDelegate.h"
 #include "WebViewClient.h"
 #include <wtf/HashMap.h>
@@ -95,13 +95,9 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     WebKit::WebFrame* topLoadingFrame() { return m_topLoadingFrame; }
     void setBlockRedirects(bool block) { m_blocksRedirects = block; }
     void setRequestReturnNull(bool returnNull) { m_requestReturnNull = returnNull; }
-    virtual void setEditCommand(const std::string& name, const std::string& value) OVERRIDE;
-    virtual void clearEditCommand() OVERRIDE;
     void setPendingExtraData(PassOwnPtr<TestShellExtraData>);
     void setDeviceScaleFactor(float);
 
-    virtual void setGamepadData(const WebKit::WebGamepads&);
-
     void paintRect(const WebKit::WebRect&);
     void updatePaintRect(const WebKit::WebRect&);
     void paintInvalidatedRegion();
@@ -116,9 +112,6 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     const HashSet<WTF::String>& clearHeaders() const { return m_clearHeaders; }
     void closeWidget();
 
-    virtual WebKit::WebContextMenuData* lastContextMenuData() const OVERRIDE;
-    virtual void clearContextMenuData() OVERRIDE;
-
 #if ENABLE(INPUT_SPEECH)
     MockWebSpeechInputController* speechInputControllerMock() { return m_speechInputControllerMock.get(); }
 #endif
@@ -135,6 +128,18 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     void setPointerLockWillFailSynchronously() { m_pointerLockPlannedResult = PointerLockWillFailSync; }
 #endif
 
+    // WebTestDelegate.
+    virtual WebKit::WebContextMenuData* lastContextMenuData() const OVERRIDE;
+    virtual void clearContextMenuData() OVERRIDE;
+    virtual void setEditCommand(const std::string& name, const std::string& value) OVERRIDE;
+    virtual void clearEditCommand() OVERRIDE;
+    virtual void fillSpellingSuggestionList(const WebKit::WebString& word, WebKit::WebVector<WebKit::WebString>* suggestions) OVERRIDE;
+    virtual void setGamepadData(const WebKit::WebGamepads&) OVERRIDE;
+    virtual void printMessage(const std::string& message) const OVERRIDE;
+    virtual void postTask(WebTestRunner::WebTask*) OVERRIDE;
+    virtual void postDelayedTask(WebTestRunner::WebTask*, long long ms) OVERRIDE;
+    virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector<WebKit::WebString>& absoluteFilenames) OVERRIDE;
+
     // NavigationHost
     virtual bool navigate(const TestNavigationEntry&, bool reload);
 
@@ -281,24 +286,23 @@ class WebViewHost : public WebKit::WebViewClient, public WebKit::WebFrameClient,
     // Spellcheck related helper APIs
     MockSpellCheck* mockSpellCheck();
     void finishLastTextCheck();
-    virtual void fillSpellingSuggestionList(const WebKit::WebString& word, WebKit::WebVector<WebKit::WebString>* suggestions) OVERRIDE;
 
     // Geolocation client mocks for DRTTestRunner
     WebKit::WebGeolocationClientMock* geolocationClientMock();
 
-    // Pending task list, Note taht the method is referred from MethodTask class.
-    TaskList* taskList() { return &m_taskList; }
+    // Pending task list, Note taht the method is referred from WebMethodTask class.
+    WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
 
     // The current web intents request.
     WebKit::WebIntentRequest* currentIntentRequest() { return &m_currentRequest; }
 
 private:
 
-    class HostMethodTask : public MethodTask<WebViewHost> {
+    class HostMethodTask : public WebTestRunner::WebMethodTask<WebViewHost> {
     public:
         typedef void (WebViewHost::*CallbackMethodType)();
         HostMethodTask(WebViewHost* object, CallbackMethodType callback)
-            : MethodTask<WebViewHost>(object)
+            : WebTestRunner::WebMethodTask<WebViewHost>(object)
             , m_callback(callback)
         { }
 
@@ -441,7 +445,7 @@ private:
     WebKit::WebString m_lastRequestedTextCheckString;
     WebKit::WebTextCheckingCompletion* m_lastRequestedTextCheckingCompletion;
 
-    TaskList m_taskList;
+    WebTestRunner::WebTaskList m_taskList;
     Vector<WebKit::WebWidget*> m_popupmenus;
 
 #if ENABLE(POINTER_LOCK)