Refactoring startup logic for upcoming FRE changes (non-Win 10).

chrome/browser/first_run/first_run_internal.h

Index: chrome/browser/first_run/first_run_internal.h
diff --git a/chrome/browser/first_run/first_run_internal.h b/chrome/browser/first_run/first_run_internal.h
index df78416a86affe7f96347237c1599716d419269c..82f91cc4d76802c4abbdead571d0ae8aa7e19fa3 100644
--- a/chrome/browser/first_run/first_run_internal.h
+++ b/chrome/browser/first_run/first_run_internal.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_INTERNAL_H_
 #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_INTERNAL_H_
 
-class MasterPrefs;
 class Profile;
 
 namespace base {
@@ -18,6 +17,8 @@ class MasterPreferences;
 
 namespace first_run {
 
+struct MasterPrefs;
+
 namespace internal {
 
 enum FirstRunState {
@@ -57,6 +58,11 @@ bool ShowPostInstallEULAIfNeeded(installer::MasterPreferences* install_prefs);
 // Returns the path for the master preferences file.
 base::FilePath MasterPrefsPath();
 
+// Helper for IsChromeFirstRun. Exposed for testing.
+FirstRunState DetermineFirstRunState(bool has_sentinel,
+                                     bool force_first_run,
+                                     bool no_first_run);
+
 }  // namespace internal
 }  // namespace first_run