1 files changed, 10 insertions, 31 deletions

diff --git a/chromium/content/renderer/websharedworker_proxy.h b/chromium/content/renderer/websharedworker_proxy.h
index a7335b3d01d..0a07489ffcb 100644
--- a/chromium/content/renderer/websharedworker_proxy.h
+++ b/chromium/content/renderer/websharedworker_proxy.h
@@ -16,7 +16,7 @@
 
 namespace content {
 
-class ChildThread;
+class MessageRouter;
 
 // Implementation of the WebSharedWorker APIs. This object is intended to only
 // live long enough to allow the caller to send a "connect" event to the worker
@@ -27,34 +27,20 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector,
                              private IPC::Listener {
  public:
   // If the worker not loaded yet, route_id == MSG_ROUTING_NONE
-  WebSharedWorkerProxy(ChildThread* child_thread,
+  WebSharedWorkerProxy(MessageRouter* router,
                        unsigned long long document_id,
-                       bool exists,
                        int route_id,
-                       int render_view_route_id);
+                       int render_frame_route_id);
   virtual ~WebSharedWorkerProxy();
 
-  // Implementations of WebSharedWorker APIs
-  virtual bool isStarted();
+  // Implementations of WebSharedWorkerConnector APIs
   virtual void connect(blink::WebMessagePortChannel* channel,
                        ConnectListener* listener);
 
-  virtual void startWorkerContext(
-      const blink::WebURL& script_url,
-      const blink::WebString& name,
-      const blink::WebString& user_agent,
-      const blink::WebString& source_code,
-      const blink::WebString& content_security_policy,
-      blink::WebContentSecurityPolicyType policy_type,
-      long long script_resource_appcache_id);
-
  private:
   // IPC::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();
 
@@ -68,17 +54,9 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector,
   // Sends any messages currently in the queue.
   void SendQueuedMessages();
 
-  void CreateWorkerContext(const GURL& script_url,
-                           bool is_shared,
-                           const base::string16& name,
-                           const base::string16& user_agent,
-                           const base::string16& source_code,
-                           const base::string16& content_security_policy,
-                           blink::WebContentSecurityPolicyType policy_type,
-                           int pending_route_id,
-                           int64 script_resource_appcache_id);
   void OnWorkerCreated();
-
+  void OnWorkerScriptLoadFailed();
+  void OnWorkerConnected();
 
   // Routing id associated with this worker - used to receive messages from the
   // worker, and also to route messages to the worker (WorkerService contains
@@ -86,10 +64,10 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector,
   // routing ids).
   int route_id_;
 
-  // The routing id for the RenderView that created this worker.
-  int render_view_route_id_;
+  // The routing id for the RenderFrame that created this worker.
+  int render_frame_route_id_;
 
-  ChildThread* child_thread_;
+  MessageRouter* const router_;
 
   // ID of our parent document (used to shutdown workers when the parent
   // document is detached).
@@ -103,6 +81,7 @@ class WebSharedWorkerProxy : public blink::WebSharedWorkerConnector,
   // the worker).
   int pending_route_id_;
   ConnectListener* connect_listener_;
+  bool created_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerProxy);
 };