Simplify threading in browser thread by making only ChromeThread deal with di...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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_main.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 146 matching lines @@
 #if defined(OS_POSIX)
 // See comment in BrowserMain, where sigaction is called.
 void SIGCHLDHandler(int signal) {
 }
 
 // See comment in BrowserMain, where sigaction is called.
 void SIGTERMHandler(int signal) {
   DCHECK_EQ(signal, SIGTERM);
   LOG(WARNING) << "Addressing SIGTERM on " << PlatformThread::CurrentId();
 
-  MessageLoop* main_loop = ChromeThread::GetMessageLoop(ChromeThread::UI);
-  if (main_loop) {
-    // Post the exit task to the main thread.
-    main_loop->PostTask(
-        FROM_HERE, NewRunnableFunction(BrowserList::CloseAllBrowsersAndExit));
+  bool posted = ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableFunction(BrowserList::CloseAllBrowsersAndExit));
+  if (posted) {
     LOG(WARNING) << "Posted task to UI thread; resetting SIGTERM handler";
   }
 
   // Reinstall the default handler.  We had one shot at graceful shutdown.
   struct sigaction term_action;
   memset(&term_action, 0, sizeof(term_action));
   term_action.sa_handler = SIG_DFL;
   CHECK(sigaction(SIGTERM, &term_action, NULL) == 0);
 
-  if (!main_loop) {
+  if (!posted) {
     // Without a UI thread to post the exit task to, there aren't many
     // options.  Raise the signal again.  The default handler will pick it up
     // and cause an ungraceful exit.
     LOG(WARNING) << "No UI thread, exiting ungracefully";
     kill(getpid(), signal);
 
     // The signal may be handled on another thread.  Give that a chance to
     // happen.
     sleep(3);
 
@@ skipping 132 matching lines @@
   FieldTrialList field_trial;
 
   std::wstring app_name = chrome::kBrowserAppName;
   std::string thread_name_string = WideToASCII(app_name + L"_BrowserMain");
 
   const char* thread_name = thread_name_string.c_str();
   PlatformThread::SetName(thread_name);
   main_message_loop.set_thread_name(thread_name);
 
   // Register the main thread by instantiating it, but don't call any methods.
-  ChromeThread main_thread;
+  ChromeThread main_thread(ChromeThread::UI, MessageLoop::current());
 
   FilePath user_data_dir;
 #if defined(OS_WIN)
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
 #else
   // Getting the user data dir can fail if the directory isn't
   // creatable, for example; on Windows in code below we bring up a
   // dialog prompting the user to pick a different directory.
   // However, ProcessSingleton needs a real user_data_dir on Mac/Linux,
   // so it's better to fail here than fail mysteriously elsewhere.
@@ skipping 59 matching lines @@
   PrefService* local_state = browser_process->local_state();
   DCHECK(local_state);
 
   // Initialize ResourceBundle which handles files loaded from external
   // sources. This has to be done before uninstall code path and before prefs
   // are registered.
   local_state->RegisterStringPref(prefs::kApplicationLocale, L"");
   local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled,
       GoogleUpdateSettings::GetCollectStatsConsent());
 
+  // Start the database thread (the order doesn't really matter for it).

[darin (slow to review), 2009/10/27 00:06:52]

Q: i'm not sure what the second part means.  the order doesn't really matter for
it??

[jam, 2009/10/27 02:38:18]

I was trying to say that we just need to start the db thread, but it doesn't
matter where in this function we do it.  I'll clarify the comment more.

[darin (slow to review), 2009/10/27 04:43:33]

OK

+  browser_process->db_thread();
+
 #if defined(TOOLKIT_GTK)
   // It is important for this to happen before the first run dialog, as it
   // styles the dialog as well.
   gtk_util::InitRCStyles();
 #elif defined(TOOLKIT_VIEWS)
   // The delegate needs to be set before any UI is created so that windows
   // display the correct icon.
   if (!views::ViewsDelegate::views_delegate)
     views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;
 #endif
@@ skipping 468 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }