Revert 116954 - Pass Content-security-policy and header type from WebSharedWorkerProxy to WebShar...

content/worker/websharedworker_stub.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "content/worker/websharedworker_stub.h"
 
 #include "content/common/child_process.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
@@ skipping 62 matching lines @@
 
 void WebSharedWorkerStub::OnChannelError() {
     OnTerminateWorkerContext();
 }
 
 const GURL& WebSharedWorkerStub::url() {
   return url_;
 }
 
 void WebSharedWorkerStub::OnStartWorkerContext(
-    const GURL& url, const string16& user_agent, const string16& source_code,
-    const string16& /* content_security_policy */, bool /* report_only */) {
+    const GURL& url, const string16& user_agent, const string16& source_code) {
   // Ignore multiple attempts to start this worker (can happen if two pages
   // try to start it simultaneously).
   if (started_)
     return;
 
-  // TODO(tsepez):  pass CSP info into worker once webkit interface updated.
   impl_->startWorkerContext(url, name_, user_agent, source_code, 0);
   started_ = true;
   url_ = url;
 
   // Process any pending connections.
   for (PendingConnectInfoList::const_iterator iter = pending_connects_.begin();
        iter != pending_connects_.end();
        ++iter) {
     OnConnect(iter->first, iter->second);
   }
@@ skipping 15 matching lines @@
   }
 }
 
 void WebSharedWorkerStub::OnTerminateWorkerContext() {
   impl_->terminateWorkerContext();
 
   // Call the client to make sure context exits.
   EnsureWorkerContextTerminates();
   started_ = false;
 }