Move the worker script loading code to the worker process (phase:2/5)

content/common/worker_messages.h

 // Copyright (c) 2012 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/strings/string16.h"
 #include "content/common/content_export.h"
+#include "content/common/content_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
-#include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"
 #include "url/gurl.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #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(base::string16, message)
   IPC_STRUCT_MEMBER(int, line_number)
   IPC_STRUCT_MEMBER(base::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(base::string16, name)
+  IPC_STRUCT_MEMBER(base::string16, content_security_policy)
+  IPC_STRUCT_MEMBER(blink::WebContentSecurityPolicyType, security_policy_type)
   IPC_STRUCT_MEMBER(int, route_id)
   IPC_STRUCT_MEMBER(int, creator_process_id)
   IPC_STRUCT_MEMBER(int64, shared_worker_appcache_id)
 IPC_STRUCT_END()
 
-IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType)
-
 //-----------------------------------------------------------------------------
 // WorkerProcess messages
 // These are messages sent from the browser to the worker process.
 IPC_MESSAGE_CONTROL1(WorkerProcessMsg_CreateWorker,
                      WorkerProcessMsg_CreateWorker_Params)
 
 //-----------------------------------------------------------------------------
 // WorkerProcessHost messages
 // These are messages sent from the worker process to the browser process.
 
@@ skipping 43 matching lines @@
 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_CONTROL1(WorkerHostMsg_WorkerContextClosed,
                      int /* worker_route_id */)
 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed)