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

chrome/browser/first_run/first_run.cc

Index: chrome/browser/first_run/first_run.cc
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 566976ed0215afefe46af044f178d0a4c51fd0f4..71d3f9f390bb102a4d1c78c7ce97ce9dbcfd4db5 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -531,14 +531,14 @@ ProcessMasterPreferencesResult ProcessMasterPreferences(
   // 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();
 
@@ -548,7 +548,7 @@ ProcessMasterPreferencesResult ProcessMasterPreferences(
     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());
 
@@ -558,7 +558,7 @@ ProcessMasterPreferencesResult ProcessMasterPreferences(
   internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
   internal::SetDefaultBrowser(install_prefs.get());
 
-  return SHOW_FIRST_RUN;
+  return DO_FIRST_RUN_TASKS;
 }
 
 void AutoImport(
@@ -653,7 +653,7 @@ void AutoImport(
 #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) {