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

content/worker/websharedworker_stub.h

Index: content/worker/websharedworker_stub.h
diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h
index 66d11ea7b18a2d0e04aaff0c733ad35160ca3c9c..b940398450f04fe22d4901a4120c44d7fb460731 100644
--- a/content/worker/websharedworker_stub.h
+++ b/content/worker/websharedworker_stub.h
@@ -14,18 +14,24 @@
 #include "url/gurl.h"
 
 namespace blink {
+class WebMessagePortChannel;
 class WebSharedWorker;
 }
 
 namespace content {
 
 class SharedWorkerDevToolsAgent;
+class WebMessagePortChannelImpl;
 
 // This class creates a WebSharedWorker, and translates incoming IPCs to the
 // appropriate WebSharedWorker APIs.
 class WebSharedWorkerStub : public IPC::Listener {
  public:
-  WebSharedWorkerStub(const base::string16& name, int route_id,
+  WebSharedWorkerStub(const GURL& url,
+                      const base::string16& name,
+                      const base::string16& content_security_policy,
+                      blink::WebContentSecurityPolicyType security_policy_type_,

[kinuko, 2013/12/20 05:29:39]

nit: trailing '_' not needed

[horo, 2013/12/20 07:31:42]

Done.

+                      int route_id,
                       const WorkerAppCacheInitInfo& appcache_init_info);
 
   // IPC::Listener implementation.
@@ -35,6 +41,9 @@ class WebSharedWorkerStub : public IPC::Listener {
   // Invoked when the WebSharedWorkerClientProxy is shutting down.
   void Shutdown();
 
+  void workerScriptLoaded();
+  void workerScriptLoadFailed();

[kinuko, 2013/12/20 05:29:39]

CamelCase if they're not for blink overrides

[horo, 2013/12/20 07:31:42]

Done.

+
   // Called after terminating the worker context to make sure that the worker
   // actually terminates (is not stuck in an infinite loop).
   void EnsureWorkerContextTerminates();
@@ -74,11 +83,11 @@ class WebSharedWorkerStub : public IPC::Listener {
   base::string16 name_;
   bool started_;
   GURL url_;
+  bool worker_script_loaded_;
   scoped_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_;
 
-  typedef std::pair<int, int> PendingConnectInfo;
-  typedef std::vector<PendingConnectInfo> PendingConnectInfoList;
-  PendingConnectInfoList pending_connects_;
+  typedef std::vector<blink::WebMessagePortChannel*> PendingChannelList;
+  PendingChannelList pending_channels_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub);
 };