Move worker_messages to content in preparation of moving worker.

TBR=avi
Review URL: http://codereview.chromium.org/6681022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77927 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 13 deletions

diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc
index 4fb7b7b..4d3dd04 100644
--- a/chrome/worker/websharedworker_stub.cc
+++ b/chrome/worker/websharedworker_stub.cc
@@ -5,9 +5,9 @@
 #include "chrome/worker/websharedworker_stub.h"
 
 #include "chrome/common/webmessageportchannel_impl.h"
-#include "chrome/common/worker_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc
index 308e589..b481bab 100644
--- a/chrome/worker/webworker_stub.cc
+++ b/chrome/worker/webworker_stub.cc
@@ -5,11 +5,10 @@
 #include "chrome/worker/webworker_stub.h"
 
 #include "base/command_line.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/webmessageportchannel_impl.h"
-#include "chrome/common/worker_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 390aaba..9bb23ba 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -6,15 +6,18 @@
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/webmessageportchannel_impl.h"
-#include "chrome/common/worker_messages.h"
-#include "chrome/renderer/webworker_proxy.h"
 #include "chrome/worker/webworker_stub_base.h"
 #include "chrome/worker/worker_thread.h"
 #include "chrome/worker/worker_webapplicationcachehost_impl.h"
+#include "content/common/content_switches.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
+#include "content/common/worker_messages.h"
+// TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the
+// renderer worker code moves to content. This code isn't used now since we
+// don't support nested workers anyways.
+//#include "content/renderer/webworker_proxy.h"
 #include "ipc/ipc_logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
@@ -113,8 +116,10 @@ void WebWorkerClientProxy::workerContextDestroyed() {
 
 WebKit::WebWorker* WebWorkerClientProxy::createWorker(
     WebKit::WebWorkerClient* client) {
-  return new WebWorkerProxy(client, WorkerThread::current(),
-                            0, appcache_host_id_);
+  // TODO(jam): see comment at top of file
+  //return new WebWorkerProxy(client, WorkerThread::current(),
+  //                          0, appcache_host_id_);
+  return NULL;
 }
 
 WebKit::WebNotificationPresenter*
diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc
index 83bb4a2..82b9f27 100644
--- a/chrome/worker/worker_main.cc
+++ b/chrome/worker/worker_main.cc
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/hi_res_timer_manager.h"
-#include "chrome/common/logging_chrome.h"
 #include "chrome/worker/worker_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/main_function_params.h"
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc
index 951a80f..ef57cce 100644
--- a/chrome/worker/worker_thread.cc
+++ b/chrome/worker/worker_thread.cc
@@ -8,13 +8,13 @@
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/db_message_filter.h"
 #include "chrome/common/web_database_observer_impl.h"
-#include "chrome/common/worker_messages.h"
 #include "chrome/worker/webworker_stub.h"
 #include "chrome/worker/websharedworker_stub.h"
 #include "chrome/worker/worker_webkitclient_impl.h"
+#include "content/common/content_switches.h"
+#include "content/common/worker_messages.h"
 #include "ipc/ipc_sync_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"