Move a few more things out of BrowserMain into helper functions....

chrome/browser/browser_main.cc

 // Copyright (c) 2010 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/hi_res_timer_manager.h"
 #include "app/l10n_util.h"
@@ skipping 464 matching lines @@
     bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
     metrics->SetUserPermitsUpload(enabled);
     if (enabled)
       metrics->Start();
 #endif
   }
 
   return metrics;
 }
 
+// Initializes the profile, possibly doing some user prompting to pick a
+// fallback profile. Returns the newly created profile, or NULL if startup
+// should not continue.
+Profile* CreateProfile(const MainFunctionParams& parameters,
+                       const FilePath& user_data_dir) {
+  Profile* profile = g_browser_process->profile_manager()->GetDefaultProfile(
+      user_data_dir);
+  if (profile)
+    return profile;
+
+#if defined(OS_WIN)
+  // Ideally, we should be able to run w/o access to disk.  For now, we
+  // prompt the user to pick a different user-data-dir and restart chrome
+  // with the new dir.
+  // http://code.google.com/p/chromium/issues/detail?id=11510
+  FilePath new_user_data_dir = UserDataDirDialog::RunUserDataDirDialog(
+      user_data_dir);
+  if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) {
+    // Only delete the resources if we're not running tests. If we're running
+    // tests the resources need to be reused as many places in the UI cache
+    // SkBitmaps from the ResourceBundle.
+    ResourceBundle::CleanupSharedInstance();
+  }
+
+  if (!new_user_data_dir.empty()) {
+    // Because of the way CommandLine parses, it's sufficient to append a new
+    // --user-data-dir switch.  The last flag of the same name wins.
+    // TODO(tc): It would be nice to remove the flag we don't want, but that
+    // sounds risky if we parse differently than CommandLineToArgvW.
+    CommandLine new_command_line = parameters.command_line_;
+    new_command_line.AppendSwitchWithValue(switches::kUserDataDir,
+                                           new_user_data_dir.ToWStringHack());
+    base::LaunchApp(new_command_line, false, false, NULL);
+  }
+#else
+  // TODO(port): fix this.  See comments near the definition of
+  // user_data_dir.  It is better to CHECK-fail here than it is to
+  // silently exit because of missing code in the above test.
+  CHECK(profile) << "Cannot get default profile.";
+#endif
+
+  return NULL;
+}
+
 #if defined(OS_WIN)
 
 // gfx::Font callbacks
 void AdjustUIFont(LOGFONT* logfont) {
   l10n_util::AdjustUIFont(logfont);
 }
 
 int GetMinimumFontSize() {
   return StringToInt(l10n_util::GetString(IDS_MINIMUM_UI_FONT_SIZE).c_str());
 }
 
 #endif
 
 #if defined(TOOLKIT_GTK)
 void InitializeToolkit() {
   // 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)
 void InitializeToolkit() {
   // 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;
 
 #if defined(OS_WIN)
   gfx::Font::adjust_font_callback = &AdjustUIFont;
   gfx::Font::get_minimum_font_size_callback = &GetMinimumFontSize;
+
+  // Init common control sex.
+  INITCOMMONCONTROLSEX config;
+  config.dwSize = sizeof(config);
+  config.dwICC = ICC_WIN95_CLASSES;
+  InitCommonControlsEx(&config);
 #endif
 }
 #else
 void InitializeToolkit() {
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 void OptionallyRunChromeOSLoginManager(const CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
@@ skipping 309 matching lines @@
 #endif
 
   if (parsed_command_line.HasSwitch(switches::kHideIcons) ||
       parsed_command_line.HasSwitch(switches::kShowIcons))
     return HandleIconsCommands(parsed_command_line);
   if (parsed_command_line.HasSwitch(switches::kMakeDefaultBrowser)) {
     return ShellIntegration::SetAsDefaultBrowser() ?
         ResultCodes::NORMAL_EXIT : ResultCodes::SHELL_INTEGRATION_FAILED;
   }
 
-  // Try to create/load the profile.
-  ProfileManager* profile_manager = browser_process->profile_manager();
 #if defined(OS_CHROMEOS)
   if (parsed_command_line.HasSwitch(switches::kLoginUser)) {
     std::string username =
         parsed_command_line.GetSwitchValueASCII(switches::kLoginUser);
     LOG(INFO) << "Relaunching browser for user: " << username;
     chromeos::UserManager::Get()->UserLoggedIn(username);
   }
 #endif
 
-  Profile* profile = profile_manager->GetDefaultProfile(user_data_dir);
+  // Profile creation ----------------------------------------------------------
 
-#if defined(OS_WIN)
-  if (!profile) {
-    // Ideally, we should be able to run w/o access to disk.  For now, we
-    // prompt the user to pick a different user-data-dir and restart chrome
-    // with the new dir.
-    // http://code.google.com/p/chromium/issues/detail?id=11510
-    user_data_dir = UserDataDirDialog::RunUserDataDirDialog(user_data_dir);
-    if (!parameters.ui_task && browser_shutdown::delete_resources_on_shutdown) {
-      // Only delete the resources if we're not running tests. If we're running
-      // tests the resources need to be reused as many places in the UI cache
-      // SkBitmaps from the ResourceBundle.
-      ResourceBundle::CleanupSharedInstance();
-    }
+  Profile* profile = CreateProfile(parameters, user_data_dir);
+  if (!profile)
+    return ResultCodes::NORMAL_EXIT;
 
-    if (!user_data_dir.empty()) {
-      // Because of the way CommandLine parses, it's sufficient to append a new
-      // --user-data-dir switch.  The last flag of the same name wins.
-      // TODO(tc): It would be nice to remove the flag we don't want, but that
-      // sounds risky if we parse differently than CommandLineToArgvW.
-      CommandLine new_command_line = parsed_command_line;
-      new_command_line.AppendSwitchWithValue(switches::kUserDataDir,
-                                             user_data_dir.ToWStringHack());
-      base::LaunchApp(new_command_line, false, false, NULL);
-    }
-
-    return ResultCodes::NORMAL_EXIT;
-  }
-#else
-  // TODO(port): fix this.  See comments near the definition of
-  // user_data_dir.  It is better to CHECK-fail here than it is to
-  // silently exit because of missing code in the above test.
-  CHECK(profile) << "Cannot get default profile.";
-#endif
+  // Post-profile init ---------------------------------------------------------
 
   PrefService* user_prefs = profile->GetPrefs();
   DCHECK(user_prefs);
 
   OptionallyRunChromeOSLoginManager(parsed_command_line);
 
   // Importing other browser settings is done in a browser-like process
   // that exits when this task has finished.
 #if defined(OS_WIN)
   if (parsed_command_line.HasSwitch(switches::kImport) ||
@@ skipping 74 matching lines @@
   // Sets things up so that if we crash from this point on, a dialog will
   // popup asking the user to restart chrome. It is done this late to avoid
   // testing against a bunch of special cases that are taken care early on.
   PrepareRestartOnCrashEnviroment(parsed_command_line);
 
   // Initialize and maintain DNS prefetcher module. Also registers an observer
   // to clear the host cache when closing incognito mode.
   chrome_browser_net::DnsGlobalInit dns_prefetch(user_prefs, local_state);
 
 #if defined(OS_WIN)
-  // Init common control sex.
-  INITCOMMONCONTROLSEX config;
-  config.dwSize = sizeof(config);
-  config.dwICC = ICC_WIN95_CLASSES;
-  InitCommonControlsEx(&config);
-
   win_util::ScopedCOMInitializer com_initializer;
 
   // Init the RLZ library. This just binds the dll and schedules a task on the
   // file thread to be run sometime later. If this is the first run we record
   // the installation event.
   RLZTracker::InitRlzDelayed(base::DIR_MODULE, is_first_run,
                              master_prefs.ping_delay);
 #endif
 
   // Configure the network module so it has access to resources.
@@ skipping 99 matching lines @@
 
   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;
 }