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

6 files changed, 2 insertions, 182 deletions

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index ca1c6bf..dc8f15a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -159,9 +159,6 @@ const char kDisableAcceleratedVideo[]       = "disable-accelerated-video";
 // Disables the alternate window station for the renderer.
 const char kDisableAltWinstation[]          = "disable-winsta";
 
-// Disable the ApplicationCache.
-const char kDisableApplicationCache[]       = "disable-application-cache";
-
 // Replaces the audio IPC layer for <audio> and <video> with a mock audio
 // device, useful when using remote desktop or machines without sound cards.
 // This is temporary until we fix the underlying problem.
@@ -200,12 +197,6 @@ const char kDisableConnectBackupJobs[]      = "disable-connect-backup-jobs";
 // Disables the custom JumpList on Windows 7.
 const char kDisableCustomJumpList[]         = "disable-custom-jumplist";
 
-// Disables HTML5 DB support.
-const char kDisableDatabases[]              = "disable-databases";
-
-// Disables desktop notifications (default enabled on windows).
-const char kDisableDesktopNotifications[]   = "disable-desktop-notifications";
-
 // Browser flag to disable the web inspector for all renderers.
 const char kDisableDevTools[]               = "disable-dev-tools";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 855a94e..5170be5 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -60,7 +60,6 @@ extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAcceleratedLayers[];
 extern const char kDisableAcceleratedVideo[];
 extern const char kDisableAltWinstation[];
-extern const char kDisableApplicationCache[];
 extern const char kDisableAudio[];
 extern const char kDisableAuthNegotiateCnameLookup[];
 extern const char kDisableBackgroundMode[];
@@ -69,8 +68,6 @@ extern const char kDisableBlockContentAnimation[];
 extern const char kDisableConfirmToQuit[];
 extern const char kDisableConnectBackupJobs[];
 extern const char kDisableCustomJumpList[];
-extern const char kDisableDatabases[];
-extern const char kDisableDesktopNotifications[];
 extern const char kDisableDevTools[];
 extern const char kDisableDeviceOrientation[];
 extern const char kDisableEnforcedThrottling[];
diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h
index 43852de..bc07d72 100644
--- a/chrome/common/common_message_generator.h
+++ b/chrome/common/common_message_generator.h
@@ -13,7 +13,6 @@
 #include "chrome/common/safebrowsing_messages.h"
 #include "chrome/common/speech_input_messages.h"
 #include "chrome/common/utility_messages.h"
-#include "chrome/common/worker_messages.h"
 
 #if 0  // This feature is not yet enabled for these files.
 
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index b17458f..5b16b02 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -19,7 +19,7 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/worker_messages.h"
+#include "content/common/worker_messages.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc
index 1fbed44..c734132 100644
--- a/chrome/common/webmessageportchannel_impl.cc
+++ b/chrome/common/webmessageportchannel_impl.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/common/webmessageportchannel_impl.h"
 
-#include "chrome/common/worker_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/child_thread.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/WebMessagePortChannelClient.h"
 
diff --git a/chrome/common/worker_messages.h b/chrome/common/worker_messages.h
deleted file mode 100644
index ba33a20..0000000
--- a/chrome/common/worker_messages.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Defines messages between the browser and worker process, as well as between
-// the renderer and worker process.
-
-// Multiply-included message file, hence no include guard.
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/string16.h"
-#include "googleurl/src/gurl.h"
-#include "ipc/ipc_message_macros.h"
-#include "ipc/ipc_message_utils.h"
-
-typedef std::pair<string16, std::vector<int> > QueuedMessage;
-
-#define IPC_MESSAGE_START WorkerMsgStart
-
-// Parameters structure for WorkerHostMsg_PostConsoleMessageToWorkerObject,
-// which has too many data parameters to be reasonably put in a predefined
-// IPC message. The data members directly correspond to parameters of
-// WebWorkerClient::postConsoleMessageToWorkerObject()
-IPC_STRUCT_BEGIN(WorkerHostMsg_PostConsoleMessageToWorkerObject_Params)
-  IPC_STRUCT_MEMBER(int, source_identifier)
-  IPC_STRUCT_MEMBER(int, message_type)
-  IPC_STRUCT_MEMBER(int, message_level)
-  IPC_STRUCT_MEMBER(string16, message)
-  IPC_STRUCT_MEMBER(int, line_number)
-  IPC_STRUCT_MEMBER(string16, source_url)
-IPC_STRUCT_END()
-
-// Parameter structure for WorkerProcessMsg_CreateWorker.
-IPC_STRUCT_BEGIN(WorkerProcessMsg_CreateWorker_Params)
-  IPC_STRUCT_MEMBER(GURL, url)
-  IPC_STRUCT_MEMBER(bool, is_shared)
-  IPC_STRUCT_MEMBER(string16, name)
-  IPC_STRUCT_MEMBER(int, route_id)
-  IPC_STRUCT_MEMBER(int, creator_process_id)
-  // Only valid for dedicated workers.
-  IPC_STRUCT_MEMBER(int, creator_appcache_host_id)
-  // Only valid for shared workers.
-  IPC_STRUCT_MEMBER(int64, shared_worker_appcache_id)
-IPC_STRUCT_END()
-
-//-----------------------------------------------------------------------------
-// WorkerProcess messages
-// These are messages sent from the browser to the worker process.
-IPC_MESSAGE_CONTROL1(WorkerProcessMsg_CreateWorker,
-                     WorkerProcessMsg_CreateWorker_Params)
-
-// Note: these Message Port related messages can also be sent to the
-// renderer process.  Putting them here since we don't have a shared place
-// like common_messages_internal.h
-IPC_MESSAGE_ROUTED3(WorkerProcessMsg_Message,
-                    string16 /* message */,
-                    std::vector<int> /* sent_message_port_ids */,
-                    std::vector<int> /* new_routing_ids */)
-
-// Tells the Message Port Channel object that there are no more in-flight
-// messages arriving.
-IPC_MESSAGE_ROUTED0(WorkerProcessMsg_MessagesQueued)
-
-
-//-----------------------------------------------------------------------------
-// WorkerProcessHost messages
-// These are messages sent from the worker process to the browser process.
-
-// Note: these Message Port related messages can also be sent out from the
-// renderer process.  Putting them here since we don't have a shared place
-// like common_messages_internal.h
-
-// Creates a new Message Port Channel object.  The first paramaeter is the
-// message port channel's routing id in this process.  The second parameter
-// is the process-wide-unique identifier for that port.
-IPC_SYNC_MESSAGE_CONTROL0_2(WorkerProcessHostMsg_CreateMessagePort,
-                            int /* route_id */,
-                            int /* message_port_id */)
-
-// Sent when a Message Port Channel object is destroyed.
-IPC_MESSAGE_CONTROL1(WorkerProcessHostMsg_DestroyMessagePort,
-                     int /* message_port_id */)
-
-// Sends a message to a message port.  Optionally sends a message port as
-// as well if sent_message_port_id != MSG_ROUTING_NONE.
-IPC_MESSAGE_CONTROL3(WorkerProcessHostMsg_PostMessage,
-                     int /* sender_message_port_id */,
-                     string16 /* message */,
-                     std::vector<int> /* sent_message_port_ids */)
-
-// Causes messages sent to the remote port to be delivered to this local port.
-IPC_MESSAGE_CONTROL2(WorkerProcessHostMsg_Entangle,
-                     int /* local_message_port_id */,
-                     int /* remote_message_port_id */)
-
-// Causes the browser to queue messages sent to this port until the the port
-// has made sure that all in-flight messages were routed to the new
-// destination.
-IPC_MESSAGE_CONTROL1(WorkerProcessHostMsg_QueueMessages,
-                     int /* message_port_id */)
-
-// Sends the browser all the queued messages that arrived at this message port
-// after it was sent in a postMessage call.
-// NOTE: MSVS can't compile the macro if std::vector<std::pair<string16, int> >
-// is used, so we typedef it in worker_messages.h.
-IPC_MESSAGE_CONTROL2(WorkerProcessHostMsg_SendQueuedMessages,
-                     int /* message_port_id */,
-                     std::vector<QueuedMessage> /* queued_messages */)
-
-// Sent by the worker process to check whether access to web databases is
-// granted by content settings.
-IPC_SYNC_MESSAGE_CONTROL5_1(WorkerProcessHostMsg_AllowDatabase,
-                            int /* worker_route_id */,
-                            GURL /* origin url */,
-                            string16 /* database name */,
-                            string16 /* database display name */,
-                            unsigned long /* estimated size */,
-                            bool /* result */)
-
-//-----------------------------------------------------------------------------
-// Worker messages
-// These are messages sent from the renderer process to the worker process.
-IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext,
-                    GURL /* url */,
-                    string16  /* user_agent */,
-                    string16  /* source_code */)
-
-IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext)
-
-IPC_MESSAGE_ROUTED3(WorkerMsg_PostMessage,
-                    string16  /* message */,
-                    std::vector<int>  /* sent_message_port_ids */,
-                    std::vector<int>  /* new_routing_ids */)
-
-IPC_MESSAGE_ROUTED2(WorkerMsg_Connect,
-                    int /* sent_message_port_id */,
-                    int /* routing_id */)
-
-IPC_MESSAGE_ROUTED0(WorkerMsg_WorkerObjectDestroyed)
-
-
-//-----------------------------------------------------------------------------
-// WorkerHost messages
-// These are messages sent from the worker process to the renderer process.
-// WorkerMsg_PostMessage is also sent here.
-IPC_MESSAGE_ROUTED3(WorkerHostMsg_PostExceptionToWorkerObject,
-                    string16  /* error_message */,
-                    int  /* line_number */,
-                    string16  /* source_url*/)
-
-IPC_MESSAGE_ROUTED1(WorkerHostMsg_PostConsoleMessageToWorkerObject,
-                    WorkerHostMsg_PostConsoleMessageToWorkerObject_Params)
-
-IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject,
-                    bool /* bool has_pending_activity */)
-
-IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity,
-                    bool /* bool has_pending_activity */)
-
-IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed,
-                     int /* worker_route_id */)
-IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed)
-