Deprecate WEBKIT thread

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"
@@ skipping 301 matching lines @@
   for (size_t thread_id = BrowserThread::UI + 1;
        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:
+      case BrowserThread::WEBKIT_DEPRECATED:
         // Special case as WebKitThread is a separate
         // type.  |thread_to_start| is not used in this case.
         break;
       case BrowserThread::FILE_USER_BLOCKING:
         thread_to_start = &file_user_blocking_thread_;
         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
@@ skipping 26 matching lines @@
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (parts_.get())
       parts_->PreStartThread(id);
 
-    if (thread_id == BrowserThread::WEBKIT) {
+    if (thread_id == BrowserThread::WEBKIT_DEPRECATED) {
       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())
@@ skipping 61 matching lines @@
     // - The WEBKIT thread (which currently is the responsibility of
     //   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:
+      case BrowserThread::WEBKIT_DEPRECATED:
         // Special case as WebKitThread is a separate
         // type.  |thread_to_stop| is not used in this case.
         break;
       case BrowserThread::FILE_USER_BLOCKING:
         thread_to_stop = &file_user_blocking_thread_;
         break;
       case BrowserThread::FILE:
         thread_to_stop = &file_thread_;
         break;
       case BrowserThread::PROCESS_LAUNCHER:
@@ skipping 15 matching lines @@
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (parts_.get())
       parts_->PreStopThread(id);
 
-    if (id == BrowserThread::WEBKIT) {
+    if (id == BrowserThread::WEBKIT_DEPRECATED) {
       webkit_thread_.reset();
     } else if (thread_to_stop) {
       thread_to_stop->reset();
     } else {
       NOTREACHED();
     }
 
     if (parts_.get())
       parts_->PostStopThread(id);
   }
@@ skipping 61 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