Pass Content-security-policy and header type from WebSharedWorkerProxy to WebSharedWorkerStub.

content/common/worker_messages.h

 // Copyright (c) 2011 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 "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 
 // Singly-included section, not converted.
 #ifndef CONTENT_COMMON_WORKER_MESSAGES_H_
 #define CONTENT_COMMON_WORKER_MESSAGES_H_
 
 typedef std::pair<string16, std::vector<int> > QueuedMessage;
 
 #endif  // CONTENT_COMMON_WORKER_MESSAGES_H_
 
 #undef IPC_MESSAGE_EXPORT
@@ skipping 15 matching lines @@
 
 // Parameter structure for WorkerProcessMsg_CreateWorker.
 IPC_STRUCT_BEGIN(WorkerProcessMsg_CreateWorker_Params)
   IPC_STRUCT_MEMBER(GURL, url)
   IPC_STRUCT_MEMBER(string16, name)
   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(WebKit::WebContentSecurityPolicyType)
+
 //-----------------------------------------------------------------------------
 // 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,
@@ skipping 63 matching lines @@
 
 // Sent by the worker process to check whether access to file system is allowed.
 IPC_SYNC_MESSAGE_CONTROL2_1(WorkerProcessHostMsg_AllowFileSystem,
                             int /* worker_route_id */,
                             GURL /* origin url */,
                             bool /* result */)
 
 //-----------------------------------------------------------------------------
 // Worker messages
 // These are messages sent from the renderer process to the worker process.
-IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext,
+IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext,
                     GURL /* url */,
                     string16  /* user_agent */,
-                    string16  /* source_code */)
+                    string16  /* source_code */,
+                    string16  /* content_security_policy */,
+                    WebKit::WebContentSecurityPolicyType)
 
 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 */,
@@ skipping 16 matching lines @@
 
 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)