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

content/renderer/websharedworker_proxy.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.
 
 #ifndef CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_
 #define CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
                        unsigned long long document_id,
                        bool exists,
                        int route_id,
                        int render_view_route_id);
   virtual ~WebSharedWorkerProxy();
 
   // Implementations of WebSharedWorker APIs
   virtual bool isStarted();
   virtual void connect(WebKit::WebMessagePortChannel* channel,
                        ConnectListener* listener);
+
+  // API is evolving from first form to second.  This function must remain
+  // virtual to avoid conflicts on the webkit roll.
+  // DEPRECATED
   virtual void startWorkerContext(const WebKit::WebURL& script_url,
                                   const WebKit::WebString& name,
                                   const WebKit::WebString& user_agent,
                                   const WebKit::WebString& source_code,
                                   long long script_resource_appcache_id);
+
+  virtual void startWorkerContext(
+      const WebKit::WebURL& script_url,
+      const WebKit::WebString& name,
+      const WebKit::WebString& user_agent,
+      const WebKit::WebString& source_code,
+      const WebKit::WebString& content_security_policy,
+      WebKit::WebContentSecurityPolicyType policy_type,
+      long long script_resource_appcache_id);
+
   virtual void terminateWorkerContext();
   virtual void clientDestroyed();
 
  private:
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Returns true if the worker is running (can send messages to it).
   bool IsStarted();
 
   // Disconnects the worker (stops listening for incoming messages).
   void Disconnect();
 
   // Sends a message to the worker thread (forwarded via the RenderViewHost).
   // If WorkerStarted() has not yet been called, message is queued.
   bool Send(IPC::Message*);
 
   // Returns true if there are queued messages.
   bool HasQueuedMessages() { return !queued_messages_.empty(); }
 
   // Sends any messages currently in the queue.
   void SendQueuedMessages();
 
   void CreateWorkerContext(const GURL& script_url,
                            bool is_shared,
                            const string16& name,
                            const string16& user_agent,
                            const string16& source_code,
+                           const string16& content_security_policy,
+                           WebKit::WebContentSecurityPolicyType policy_type,
                            int pending_route_id,
                            int64 script_resource_appcache_id);
   void OnWorkerCreated();
 
 
   // Routing id associated with this worker - used to receive messages from the
   // worker, and also to route messages to the worker (WorkerService contains
   // a map that maps between these renderer-side route IDs and worker-side
   // routing ids).
   int route_id_;
@@ skipping 13 matching lines @@
   // The id for the placeholder worker instance we've stored on the
   // browser process (we need to pass this same route id back in when creating
   // the worker).
   int pending_route_id_;
   ConnectListener* connect_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy);
 };
 
 #endif  // CONTENT_RENDERER_WEBSHAREDWORKER_PROXY_H_