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

chrome/browser/first_run/first_run.h

 // 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.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
 // install work for this user. After that the sentinel file is created.
 namespace first_run {
 
 enum FirstRunBubbleMetric {
   FIRST_RUN_BUBBLE_SHOWN = 0,       // The search engine bubble was shown.
   FIRST_RUN_BUBBLE_CHANGE_INVOKED,  // The bubble's "Change" was invoked.
   NUM_FIRST_RUN_BUBBLE_METRICS
 };
 
 enum ProcessMasterPreferencesResult {
-  SHOW_FIRST_RUN = 0,           // Should show the first run flow.
-  SKIP_FIRST_RUN,               // Should skip the first run flow.
+  DO_FIRST_RUN_TASKS = 0,       // Should do the first run tasks.
+  SKIP_FIRST_RUN_TASKS,         // Should skip the first run tasks.
   EULA_EXIT_NOW,                // Should immediately exit due to EULA flow.
 };
 
 // See ProcessMasterPreferences for more info about this structure.
 struct MasterPrefs {
   MasterPrefs();
   ~MasterPrefs();
 
   int ping_delay;
   bool homepage_defined;
@@ skipping 46 matching lines @@
 // Automatically import history and home page (and search engine, if
 // ShouldShowSearchEngineDialog is true).
 void AutoImport(Profile* profile,
                 bool homepage_defined,
                 int import_items,
                 int dont_import_items,
                 ProcessSingleton* process_singleton);
 
 // Does remaining first run tasks for |profile| and makes Chrome default browser
 // if |make_chrome_default|.
-void DoFirstRunTasks(Profile* profile, bool make_chrome_default);
+void DoPostImportTasks(Profile* profile, bool make_chrome_default);
 
 // Imports bookmarks and/or browser items (depending on platform support)
 // in this process. This function is paired with first_run::ImportSettings().
 // This function might or might not show a visible UI depending on the
 // cmdline parameters.
 int ImportNow(Profile* profile, const CommandLine& cmdline);
 
 // Returns the path for the master preferences file.
 FilePath MasterPrefsPath();
 
@@ skipping 32 matching lines @@
                        const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunBubbleLauncher);
 };
 
 }  // namespace first_run
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_