[Fixit Dec-2012] Refactor first_run, very few things should depend on whether the First Run senti...

chrome/browser/first_run/first_run.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 "chrome/browser/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 513 matching lines @@
 
 ProcessMasterPreferencesResult ProcessMasterPreferences(
     const FilePath& user_data_dir,
     MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
 
 #if defined(OS_CHROMEOS)
   // Chrome OS has its own out-of-box-experience code.  Create the sentinel to
   // mark the fact that we've run once but skip the full first-run flow.
   CreateSentinel();
-  return SKIP_FIRST_RUN;
+  return SKIP_FIRST_RUN_TASKS;
 #endif
 
   FilePath master_prefs_path;
   scoped_ptr<installer::MasterPreferences>
       install_prefs(internal::LoadMasterPrefs(&master_prefs_path));
   if (!install_prefs.get())
-    return SHOW_FIRST_RUN;
+    return DO_FIRST_RUN_TASKS;
 
   out_prefs->new_tabs = install_prefs->GetFirstRunTabs();
 
   internal::SetRLZPref(out_prefs, install_prefs.get());
 
   if (!internal::ShowPostInstallEULAIfNeeded(install_prefs.get()))
     return EULA_EXIT_NOW;
 
   if (!internal::CopyPrefFile(user_data_dir, master_prefs_path))
-    return SHOW_FIRST_RUN;
+    return DO_FIRST_RUN_TASKS;
 
   DoDelayedInstallExtensionsIfNeeded(install_prefs.get());
 
   internal::SetupMasterPrefsFromInstallPrefs(out_prefs,
       install_prefs.get());
 
   internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
   internal::SetDefaultBrowser(install_prefs.get());
 
-  return SHOW_FIRST_RUN;
+  return DO_FIRST_RUN_TASKS;
 }
 
 void AutoImport(
     Profile* profile,
     bool homepage_defined,
     int import_items,
     int dont_import_items,
     ProcessSingleton* process_singleton) {
 #if !defined(USE_AURA)
   // We need to avoid dispatching new tabs when we are importing because
@@ skipping 74 matching lines @@
     internal::ImportSettings(profile, importer_host, importer_list, items);
   }
 
   content::RecordAction(UserMetricsAction("FirstRunDef_Accept"));
 
   process_singleton->Unlock();
   first_run::CreateSentinel();
 #endif  // !defined(USE_AURA)
 }
 
-void DoFirstRunTasks(Profile* profile, bool make_chrome_default) {
+void DoPostImportTasks(Profile* profile, bool make_chrome_default) {
   if (make_chrome_default &&
       ShellIntegration::CanSetAsDefaultBrowser() ==
           ShellIntegration::SET_DEFAULT_UNATTENDED) {
     ShellIntegration::SetAsDefaultBrowser();
   }
 
 #if !defined(USE_AURA)
   FilePath local_state_path;
   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
   bool local_state_file_exists = file_util::PathExists(local_state_path);
 
   // Launch the first run dialog only for certain builds, and only if the user
   // has not already set preferences.
   if (internal::IsOrganicFirstRun() && !local_state_file_exists) {
     startup_metric_utils::SetNonBrowserUIDisplayed();
     ShowFirstRunDialog(profile);
   }
   // Display the first run bubble if there is a default search provider.
   TemplateURLService* template_url =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (template_url && template_url->GetDefaultSearchProvider())
     FirstRunBubbleLauncher::ShowFirstRunBubbleSoon();
   SetShowWelcomePagePref();
   SetPersonalDataManagerFirstRunPref();
 #endif  // !defined(USE_AURA)
 }
 
 }  // namespace first_run