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

chrome/browser/first_run/first_run.h

Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index ed9addcb7fb84c62013a58f49acce6407349f0f9..4d0079fb8ee99143761e3614153cb8418b93f6b4 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "build/build_config.h"
+#include "chrome/browser/first_run/first_run_internal.h"
 
 class GURL;
 class Profile;
@@ -87,9 +88,15 @@ struct MasterPrefs {
   std::string suppress_default_browser_prompt_for_version;
 };
 
-// Returns true if this is the first time chrome is run for this user.
+// Returns true if Chrome should behave as if this is the first time Chrome is
+// run for this user.
 bool IsChromeFirstRun();
 
+// Helper for IsChromeFirstRun. Exposed for testing.
+internal::FirstRunState DetermineFirstRunState(bool has_sentinel,

[grt (UTC plus 2), 2016/09/09 11:40:29]

can you move this into first_run_internal.h and put the impl inside the internal
namespace in first_run.cc? the unittest already #includes _internal.h and tests
various internal:: funcs

+                                               bool has_force_switch,
+                                               bool has_suppress_switch);
+
 #if defined(OS_MACOSX)
 // Returns true if |command_line|'s switches explicitly specify that first run
 // should be suppressed in the current run.
@@ -135,6 +142,10 @@ void SetShouldShowWelcomePage();
 // SetShouldShowWelcomePage() is called.
 bool ShouldShowWelcomePage();
 
+// Iterates over the given tabs, replacing "magic words" designated for
+// use in Master Preferences files with corresponding URLs.
+std::vector<GURL> ProcessMasterPrefsTabs(const std::vector<GURL>& tabs);
+
 // Sets a flag that will cause ShouldDoPersonalDataManagerFirstRun()
 // to return true exactly once, so that the browser loads
 // PersonalDataManager once the main message loop gets going.