Start/stop WebKitThread from BrowserMainLoop like other BrowserThreads.

content/browser/browser_main_loop.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/browser/browser_main_loop.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/browser_thread_impl.h"
+#include "content/browser/in_process_webkit/webkit_thread.h"
 #include "content/browser/trace_controller.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/sandbox_policy.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_shutdown.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "crypto/nss_util.h"
@@ skipping 288 matching lines @@
        thread_id < BrowserThread::ID_COUNT;
        ++thread_id) {
     scoped_ptr<BrowserProcessSubThread>* thread_to_start = NULL;
     base::Thread::Options* options = &default_options;
 
     switch (thread_id) {
       case BrowserThread::DB:
         thread_to_start = &db_thread_;
         break;
       case BrowserThread::WEBKIT:
-        // For now, the WebKit thread in the browser is owned by
-        // ResourceDispatcherHost, not by the content framework. Until
-        // this is fixed, we don't start the thread but still call
-        // Pre/PostStartThread for the ID.
+        // Special case as WebKitThread is a separate
+        // type.  |thread_to_start| is not used in this case.
         break;
       case BrowserThread::FILE:
         thread_to_start = &file_thread_;
 #if defined(OS_WIN)
         // On Windows, the FILE thread needs to be have a UI message loop
         // which pumps messages in such a way that Google Update can
         // communicate back to us.
         options = &ui_message_loop_options;
 #else
         options = &io_message_loop_options;
@@ skipping 21 matching lines @@
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (parts_.get())
       parts_->PreStartThread(id);
 
-    if (thread_to_start) {
+    if (thread_id == BrowserThread::WEBKIT) {
+      webkit_thread_.reset(new WebKitThread);
+      webkit_thread_->Initialize();
+    } else if (thread_to_start) {
       (*thread_to_start).reset(new BrowserProcessSubThread(id));
       (*thread_to_start)->StartWithOptions(*options);
+    } else {
+      NOTREACHED();
     }
 
     if (parts_.get())
       parts_->PostStartThread(id);
   }
 
   if (parts_.get())
     parts_->PreMainMessageLoopRun();
 
   TRACE_EVENT_BEGIN_ETW("BrowserMain:MESSAGE_LOOP", 0, "");
@@ skipping 55 matching lines @@
     //   the embedder to stop, by destroying ResourceDispatcherHost
     //   before the DB thread is stopped)
     //
     // - (Not sure why DB stops last.)
     scoped_ptr<BrowserProcessSubThread>* thread_to_stop = NULL;
     switch (thread_id) {
       case BrowserThread::DB:
         thread_to_stop = &db_thread_;
         break;
       case BrowserThread::WEBKIT:
-        // For now, the WebKit thread in the browser is owned by
-        // ResourceDispatcherHost, not by the content framework. Until
-        // this is fixed, we don't stop the thread but still call
-        // Pre/PostStopThread for the ID.
+        // Special case as WebKitThread is a separate
+        // type.  |thread_to_stop| is not used in this case.
         break;
       case BrowserThread::FILE:
         thread_to_stop = &file_thread_;
         break;
       case BrowserThread::PROCESS_LAUNCHER:
         thread_to_stop = &process_launcher_thread_;
         break;
       case BrowserThread::CACHE:
         thread_to_stop = &cache_thread_;
         break;
       case BrowserThread::IO:
         thread_to_stop = &io_thread_;
         break;
 #if defined(OS_CHROMEOS)
       case BrowserThread::WEB_SOCKET_PROXY:
         thread_to_stop = &web_socket_proxy_thread_;
         break;
 #endif
       case BrowserThread::UI:
       case BrowserThread::ID_COUNT:
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (parts_.get())
       parts_->PreStopThread(id);
-    if (thread_to_stop)
+
+    if (id == BrowserThread::WEBKIT) {
+      webkit_thread_.reset();
+    } else if (thread_to_stop) {
       thread_to_stop->reset();
+    } else {
+      NOTREACHED();
+    }
+
     if (parts_.get())
       parts_->PostStopThread(id);
   }
 
   if (parts_.get())
     parts_->PostDestroyThreads();
 }
 
 void BrowserMainLoop::InitializeMainThread() {
   const char* kThreadName = "CrBrowserMain";
@@ skipping 50 matching lines @@
     MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task);
 
 #if defined(OS_MACOSX)
   MessageLoopForUI::current()->Run();
 #else
   MessageLoopForUI::current()->RunWithDispatcher(NULL);
 #endif
 }
 
 }  // namespace content