Merge 3 different ways of obtaining first run state into a single one.

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 44 matching lines @@
 // Options for the first run bubble. The default is FIRST_RUN_BUBBLE_DONT_SHOW.
 // FIRST_RUN_BUBBLE_SUPPRESS is stronger in that FIRST_RUN_BUBBLE_SHOW should
 // never be set once FIRST_RUN_BUBBLE_SUPPRESS is set.
 enum FirstRunBubbleOptions {
   FIRST_RUN_BUBBLE_DONT_SHOW,
   FIRST_RUN_BUBBLE_SUPPRESS,
   FIRST_RUN_BUBBLE_SHOW,
 };
 
 enum ProcessMasterPreferencesResult {
-  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.
+  FIRST_RUN_PROCEED = 0,  // Proceed with first run.
+  EULA_EXIT_NOW,          // Should immediately exit due to EULA flow.
 };
 
 // See ProcessMasterPreferences for more info about this structure.
 struct MasterPrefs {
   MasterPrefs();
   ~MasterPrefs();
 
   // TODO(macourteau): as part of the master preferences refactoring effort,
   // remove items from here which are being stored temporarily only to be later
   // dumped into local_state. Also see related TODO in chrome_browser_main.cc.
@@ skipping 115 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_