Removing dedicated worker-related IPC codei (first round).

content/worker/websharedworker_stub.cc

 // 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"
+#include "base/compiler_specific.h"
+#include "content/worker/worker_thread.h"
 #include "content/worker/shared_worker_devtools_agent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 
 WebSharedWorkerStub::WebSharedWorkerStub(
     const string16& name, int route_id,
     const WorkerAppCacheInitInfo& appcache_init_info)
-    : WebWorkerStubBase(route_id, appcache_init_info),
+    : route_id_(route_id),
+      appcache_init_info_(appcache_init_info),
+      ALLOW_THIS_IN_INITIALIZER_LIST(client_(route_id, this)),
       name_(name),
       started_(false),
       worker_devtools_agent_(NULL) {
+
+  WorkerThread* workerThread = WorkerThread::current();

[jam, 2011/10/26 22:25:38]

nit: worker_thread (i know it was like that before, but should make this conform
to our style guide while we're changing this). also below

+  DCHECK(workerThread);
+  workerThread->AddWorkerStub(this);
+  // Start processing incoming IPCs for this worker.
+  workerThread->AddRoute(route_id_, this);
+  ChildProcess::current()->AddRefProcess();
+
   // TODO(atwilson): Add support for NaCl when they support MessagePorts.
   impl_ = WebKit::WebSharedWorker::create(client());
   worker_devtools_agent_.reset(new SharedWorkerDevToolsAgent(route_id, impl_));
   client()->set_devtools_agent(worker_devtools_agent_.get());
 }
 
 WebSharedWorkerStub::~WebSharedWorkerStub() {
   impl_->clientDestroyed();
+  WorkerThread* workerThread = WorkerThread::current();
+  DCHECK(workerThread);
+  workerThread->RemoveWorkerStub(this);
+  workerThread->RemoveRoute(route_id_);
+  ChildProcess::current()->ReleaseProcess();
+}
+
+void WebSharedWorkerStub::Shutdown() {
+  // The worker has exited - free ourselves and the client.
+  delete this;
+}
+
+void WebSharedWorkerStub::EnsureWorkerContextTerminates() {
+  client_.EnsureWorkerContextTerminates();
 }
 
 bool WebSharedWorkerStub::OnMessageReceived(const IPC::Message& message) {
   if (worker_devtools_agent_->OnMessageReceived(message))
     return true;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebSharedWorkerStub, message)
     IPC_MESSAGE_HANDLER(WorkerMsg_StartWorkerContext, OnStartWorkerContext)
     IPC_MESSAGE_HANDLER(WorkerMsg_TerminateWorkerContext,
                         OnTerminateWorkerContext)
     IPC_MESSAGE_HANDLER(WorkerMsg_Connect, OnConnect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WebSharedWorkerStub::OnChannelError() {
     OnTerminateWorkerContext();
 }
 
-const GURL& WebSharedWorkerStub::url() const {
+const GURL& WebSharedWorkerStub::url() {
   return url_;
 }
 
 void WebSharedWorkerStub::OnStartWorkerContext(
     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;
 
@@ skipping 25 matching lines @@
   }
 }
 
 void WebSharedWorkerStub::OnTerminateWorkerContext() {
   impl_->terminateWorkerContext();
 
   // Call the client to make sure context exits.
   EnsureWorkerContextTerminates();
   started_ = false;
 }