1 files changed, 27 insertions, 25 deletions

diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h
index 4af1f64..8ae78c6 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_GLUE_WEBWORKER_IMPL_H_
 #define WEBKIT_GLUE_WEBWORKER_IMPL_H_
 
-#include "webkit/glue/webworker.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebWorker.h"
 
 #if ENABLE(WORKERS)
 
@@ -26,33 +26,35 @@ class WorkerThread;
 // WebCore::WorkerObjectProxy, this class will conver to Chrome data types first
 // and then call the supplied WebWorkerClient.
 class WebWorkerImpl: public WebCore::WorkerObjectProxy,
-                     public WebWorker {
+                     public WebKit::WebWorker {
  public:
-  WebWorkerImpl(WebWorkerClient* client);
+  explicit WebWorkerImpl(WebKit::WebWorkerClient* client);
   virtual ~WebWorkerImpl();
 
-  // WebCore::WorkerObjectProxy implementation.
-  void postMessageToWorkerObject(const WebCore::String& message);
-  void postExceptionToWorkerObject(const WebCore::String& errorMessage,
-                                   int lineNumber,
-                                   const WebCore::String& sourceURL);
-  void postConsoleMessageToWorkerObject(WebCore::MessageDestination destination,
-                                        WebCore::MessageSource source,
-                                        WebCore::MessageLevel level,
-                                        const WebCore::String& message,
-                                        int lineNumber,
-                                        const WebCore::String& sourceURL);
-  void confirmMessageFromWorkerObject(bool hasPendingActivity);
-  void reportPendingActivity(bool hasPendingActivity);
-  void workerContextDestroyed();
+  // WebCore::WorkerObjectProxy methods:
+  virtual void postMessageToWorkerObject(const WebCore::String& message);
+  virtual void postExceptionToWorkerObject(
+      const WebCore::String& error_message,
+      int line_number,
+      const WebCore::String& source_url);
+  virtual void postConsoleMessageToWorkerObject(
+      WebCore::MessageDestination destination,
+      WebCore::MessageSource source,
+      WebCore::MessageLevel level,
+      const WebCore::String& message,
+      int line_number,
+      const WebCore::String& source_url);
+  virtual void confirmMessageFromWorkerObject(bool has_pending_activity);
+  virtual void reportPendingActivity(bool has_pending_activity);
+  virtual void workerContextDestroyed();
 
-  // WebWorker implementation.
-  void StartWorkerContext(const GURL& script_url,
-                          const string16& user_agent,
-                          const string16& source_code);
-  void TerminateWorkerContext();
-  void PostMessageToWorkerContext(const string16& message);
-  void WorkerObjectDestroyed();
+  // WebWorker methods:
+  virtual void startWorkerContext(const WebKit::WebURL& script_url,
+                                  const WebKit::WebString& user_agent,
+                                  const WebKit::WebString& source_code);
+  virtual void terminateWorkerContext();
+  virtual void postMessageToWorkerContext(const WebKit::WebString& message);
+  virtual void workerObjectDestroyed();
 
  private:
   static void PostMessageToWorkerContextTask(
@@ -60,7 +62,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
       WebWorkerImpl* this_ptr,
       const WebCore::String& message);
 
-  WebWorkerClient* client_;
+  WebKit::WebWorkerClient* client_;
   WTF::RefPtr<WebCore::WorkerThread> worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(WebWorkerImpl);