Get rid of BrowserThread::WEB_SOCKET_PROXY. BrowserThread is only for threads that are used in ma...

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/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 331 matching lines @@
         thread_to_start = &process_launcher_thread_;
         break;
       case BrowserThread::CACHE:
         thread_to_start = &cache_thread_;
         options = &io_message_loop_options;
         break;
       case BrowserThread::IO:
         thread_to_start = &io_thread_;
         options = &io_message_loop_options;
         break;
-#if defined(OS_CHROMEOS)
-      case BrowserThread::WEB_SOCKET_PROXY:
-        thread_to_start = &web_socket_proxy_thread_;
-        options = &io_message_loop_options;
-        break;
-#endif
       case BrowserThread::UI:
       case BrowserThread::ID_COUNT:
       default:
         NOTREACHED();
         break;
     }
 
     BrowserThread::ID id = static_cast<BrowserThread::ID>(thread_id);
 
     if (parts_.get())
@@ skipping 54 matching lines @@
        --thread_id) {
     // Find the thread object we want to stop. Looping over all valid
     // BrowserThread IDs and DCHECKing on a missing case in the switch
     // statement helps avoid a mismatch between this code and the
     // BrowserThread::ID enumeration.
     //
     // The destruction order is the reverse order of occurrence in the
     // BrowserThread::ID list. The rationale for the order is as
     // follows (need to be filled in a bit):
     //
-    // - (Not sure why the WEB_SOCKET_PROXY thread is stopped first.)
     //
     // - 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
@@ skipping 18 matching lines @@
         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())
@@ skipping 74 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