Remove unused WEBKIT_DEPRECATED thread

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 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/bind.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/pending_task.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/timer/hi_res_timer_manager.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/device_orientation/device_motion_service.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/gamepad/gamepad_service.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/histogram_synchronizer.h"
-#include "content/browser/in_process_webkit/webkit_thread.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/media/audio_mirroring_manager.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "content/browser/tracing/trace_controller_impl.h"
 #include "content/browser/webui/content_web_ui_controller_factory.h"
 #include "content/browser/webui/url_data_manager.h"
 #include "content/public/browser/browser_main_parts.h"
@@ skipping 483 matching lines @@
     scoped_ptr<BrowserProcessSubThread>* thread_to_start = NULL;
     base::Thread::Options* options = &default_options;
 
     switch (thread_id) {
       case BrowserThread::DB:
         TRACE_EVENT_BEGIN1("startup",
             "BrowserMainLoop::CreateThreads:start",
             "Thread", "BrowserThread::DB");
         thread_to_start = &db_thread_;
         break;
-      case BrowserThread::WEBKIT_DEPRECATED:
-        // Special case as WebKitThread is a separate
-        // type.  |thread_to_start| is not used in this case.
-        TRACE_EVENT_BEGIN1("startup",
-            "BrowserMainLoop::CreateThreads:start",
-            "Thread", "BrowserThread::WEBKIT_DEPRECATED");
-        break;
       case BrowserThread::FILE_USER_BLOCKING:
         TRACE_EVENT_BEGIN1("startup",
             "BrowserMainLoop::CreateThreads:start",
             "Thread", "BrowserThread::FILE_USER_BLOCKING");
         thread_to_start = &file_user_blocking_thread_;
         break;
       case BrowserThread::FILE:
         TRACE_EVENT_BEGIN1("startup",
             "BrowserMainLoop::CreateThreads:start",
             "Thread", "BrowserThread::FILE");
@@ skipping 29 matching lines @@
         break;
       case BrowserThread::UI:
       case BrowserThread::ID_COUNT:
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
-    if (thread_id == BrowserThread::WEBKIT_DEPRECATED) {
-#if !defined(OS_IOS)
-      webkit_thread_.reset(new WebKitThread);
-      webkit_thread_->Initialize();
-#endif
-    } else if (thread_to_start) {
+    if (thread_to_start) {
       (*thread_to_start).reset(new BrowserProcessSubThread(id));
       (*thread_to_start)->StartWithOptions(*options);
     } else {
       NOTREACHED();
     }
 
     TRACE_EVENT_END0("startup", "BrowserMainLoop::CreateThreads:start");
 
   }
 
@@ skipping 81 matching lines @@
     // BrowserThread::ID list. The rationale for the order is as
     // follows (need to be filled in a bit):
     //
     //
     // - The IO thread is the only user of the CACHE thread.
     //
     // - The PROCESS_LAUNCHER thread must be stopped after IO in case
     //   the IO thread posted a task to terminate a process on the
     //   process launcher thread.
     //
-    // - (Not sure why FILE needs to stop before WEBKIT.)
-    //
-    // - 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.)
     switch (thread_id) {
       case BrowserThread::DB:
         db_thread_.reset();
         break;
-      case BrowserThread::WEBKIT_DEPRECATED:
-        // Special case as WebKitThread is a separate
-        // type.  |thread_to_stop| is not used in this case.
-
-        // Need to destroy ResourceDispatcherHost before PluginService
-        // and since it caches a pointer to it.
-        resource_dispatcher_host_.reset();
-#if !defined(OS_IOS)
-        webkit_thread_.reset();
-#endif
-        break;
       case BrowserThread::FILE_USER_BLOCKING:
         file_user_blocking_thread_.reset();
         break;
       case BrowserThread::FILE:
 #if !defined(OS_IOS)
         // Clean up state that lives on or uses the file_thread_ before
         // it goes away.
         if (resource_dispatcher_host_)
           resource_dispatcher_host_.get()->save_file_manager()->Shutdown();
 #endif  // !defined(OS_IOS)
@@ skipping 193 matching lines @@
   if (parameters_.ui_task)
     base::MessageLoopForUI::current()->PostTask(FROM_HERE,
                                                 *parameters_.ui_task);
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 }  // namespace content