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 90375e2ea827db4944aaebeaeb2f255a75611393..4daaf13857d8a1ccaeb076ac75043882c063420a 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -90,6 +90,10 @@ struct MasterPrefs {
 // Returns true if this is the first time chrome is run for this user.
 bool IsChromeFirstRun();
 
+// Testing-only function used to confirm behaviors specific to first run (or
+// non-first run).
+void SetFirstRunForTesting(bool is_first_run);
+
 #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 +139,22 @@ void SetShouldShowWelcomePage();
 // SetShouldShowWelcomePage() is called.
 bool ShouldShowWelcomePage();
 
+// Gets the URL for the "Welcome to Chrome" dialog.
+// TODO(tmartino): Update to return new Welcome page when complete,
+// subject to check against kUseNewFirstRun feature.
+GURL GetWelcomePageURL();
+
+// Returns true iff the current OS is Windows and the version is >= 10.
+bool IsWin10();

[Roger Tawa OOO till Jul 10th, 2016/07/26 15:00:26]

Should put this inside #ifdef OS_WIN, or somehow refactor code so that windows
specific code only appears in first_run_internal_win.cc

[tmartino, 2016/07/27 18:40:43]

For the time being, where we want to use this both in the policy logic and as a
guard against using the new flow at all, things are a lot cleaner this way. I've
added a TODO and will make that move in the CL which adds the Win10 logic (and
therefore removes the guard from startup_browser_creator_impl).

Note that on non-Windows platforms this currently just returns false, so it
doesn't particularly introduce any risk.

+
+// Checks internal state regarding first-run and onboarding, and returns
+// a vector, possibly empty, of tabs to be shown to the user.
+std::vector<GURL> GetOnboardingTabs();
+
+// Iterates over the given tabs, replacing "magic words" designated for
+// use in Master Prefs 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.