3 files changed, 11 insertions, 30 deletions
diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc
index 03831b8b..d6304ab 100644
--- a/chrome/worker/worker_main.cc
+++ b/chrome/worker/worker_main.cc
@@ -20,15 +20,16 @@
 
 // Mainline routine for running as the worker process.
 int WorkerMain(const MainFunctionParams& parameters) {
-  // The main thread of the render process.
-  MessageLoopForIO main_message_loop;
+  // The main message loop of the worker process.
+  MessageLoop main_message_loop;
   std::wstring app_name = chrome::kBrowserAppName;
   PlatformThread::SetName(WideToASCII(app_name + L"_WorkerMain").c_str());
 
   // Initialize the SystemMonitor
   base::SystemMonitor::Start();
 
-  ChildProcess worker_process(new WorkerThread());
+  ChildProcess worker_process;
+  worker_process.set_main_thread(new WorkerThread());
 #if defined(OS_WIN)
   sandbox::TargetServices* target_services =
       parameters.sandbox_info_.TargetServices();
diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc
index 7663b7a..e4be0b9 100644
--- a/chrome/worker/worker_thread.cc
+++ b/chrome/worker/worker_thread.cc
@@ -15,37 +15,22 @@ static base::LazyInstance<base::ThreadLocalPointer<WorkerThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 
-WorkerThread::WorkerThread()
-    : ChildThread(base::Thread::Options(MessageLoop::TYPE_DEFAULT,
-                                        kV8StackSize)) {
-}
-
-WorkerThread::~WorkerThread() {
-}
-
-WorkerThread* WorkerThread::current() {
-  return lazy_tls.Pointer()->Get();
-}
-
-void WorkerThread::Init() {
+WorkerThread::WorkerThread() {
   lazy_tls.Pointer()->Set(this);
-  ChildThread::Init();
   webkit_client_.reset(new WorkerWebKitClientImpl);
   WebKit::initialize(webkit_client_.get());
 }
 
-void WorkerThread::CleanUp() {
+WorkerThread::~WorkerThread() {
   // Shutdown in reverse of the initialization order.
-
-  if (webkit_client_.get()) {
-    WebKit::shutdown();
-    webkit_client_.reset();
-  }
-
-  ChildThread::CleanUp();
+  WebKit::shutdown();
   lazy_tls.Pointer()->Set(NULL);
 }
 
+WorkerThread* WorkerThread::current() {
+  return lazy_tls.Pointer()->Get();
+}
+
 void WorkerThread::OnControlMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(WorkerThread, msg)
     IPC_MESSAGE_HANDLER(WorkerProcessMsg_CreateWorker, OnCreateWorker)
diff --git a/chrome/worker/worker_thread.h b/chrome/worker/worker_thread.h
index 6bea33c..27d0abf 100644
--- a/chrome/worker/worker_thread.h
+++ b/chrome/worker/worker_thread.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_WORKER_WORKER_THREAD_H_
 #define CHROME_WORKER_WORKER_THREAD_H_
 
-#include "base/thread.h"
 #include "chrome/common/child_thread.h"
 
 class GURL;
@@ -22,10 +21,6 @@ class WorkerThread : public ChildThread {
  private:
   virtual void OnControlMessageReceived(const IPC::Message& msg);
 
-  // Called by the thread base class
-  virtual void Init();
-  virtual void CleanUp();
-
   void OnCreateWorker(const GURL& url, int route_id);
 
   scoped_ptr<WorkerWebKitClientImpl> webkit_client_;