Remove BrowserThread::UnsafeGetBrowserThread, add UnsafeGetMessageLoopForThread.

chrome/browser/browser_process_impl.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 "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 273 matching lines @@
 void BrowserProcessImpl::PostStopThread(BrowserThread::ID thread_id) {
   switch (thread_id) {
     case BrowserThread::FILE:
       // With the file_thread_ flushed, we can release any icon resources.
       icon_manager_.reset();
       break;
     case BrowserThread::IO:
       // Reset associated state right after actual thread is stopped,
       // as io_thread_.global_ cleanup happens in CleanUp on the IO
       // thread, i.e. as the thread exits its message loop.
+      //
+      // This is important also because in various places, the
+      // IOThread object being NULL is considered synonymous with the
+      // IO thread having stopped.
       io_thread_.reset();
       break;
     default:
       break;
   }
 }
 
 #if defined(OS_WIN)
 // Send a QuitTask to the given MessageLoop when the (file) thread has processed
 // our (other) recent requests (to save preferences).
@@ skipping 103 matching lines @@
     CreateMetricsService();
   return metrics_service_.get();
 }
 
 IOThread* BrowserProcessImpl::io_thread() {
   DCHECK(CalledOnValidThread());
   DCHECK(io_thread_.get());
   return io_thread_.get();
 }
 
-base::Thread* BrowserProcessImpl::file_thread() {
-  DCHECK(CalledOnValidThread());
-  return BrowserThread::UnsafeGetBrowserThread(BrowserThread::FILE);
-}
-
-base::Thread* BrowserProcessImpl::db_thread() {
-  DCHECK(CalledOnValidThread());
-  return BrowserThread::UnsafeGetBrowserThread(BrowserThread::DB);
-}
-
 WatchDogThread* BrowserProcessImpl::watchdog_thread() {
   DCHECK(CalledOnValidThread());
   if (!created_watchdog_thread_)
     CreateWatchdogThread();
   DCHECK(watchdog_thread_.get() != NULL);
   return watchdog_thread_.get();
 }
 
-#if defined(OS_CHROMEOS)
-base::Thread* BrowserProcessImpl::web_socket_proxy_thread() {
-  DCHECK(CalledOnValidThread());
-  return BrowserThread::UnsafeGetBrowserThread(BrowserThread::WEB_SOCKET_PROXY);
-}
-#endif
-
 ProfileManager* BrowserProcessImpl::profile_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_profile_manager_)
     CreateProfileManager();
   return profile_manager_.get();
 }
 
 PrefService* BrowserProcessImpl::local_state() {
   DCHECK(CalledOnValidThread());
   if (!created_local_state_)
@@ skipping 538 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)