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

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 <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "build/build_config.h"
+#include "chrome/browser/first_run/first_run_internal.h"
 
 class GURL;
 class Profile;
 
 namespace base {
 class CommandLine;
 class FilePath;
 }
 
 namespace user_prefs {
@@ skipping 56 matching lines @@
   bool welcome_page_on_os_upgrade_enabled;
   std::vector<GURL> new_tabs;
   std::vector<GURL> bookmarks;
   std::string import_bookmarks_path;
   std::string compressed_variations_seed;
   std::string variations_seed;
   std::string variations_seed_signature;
   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.
 bool IsFirstRunSuppressed(const base::CommandLine& command_line);
 #endif
 
 // Returns whether metrics reporting is currently opt-in. This is used to
 // determine if the enable metrics reporting checkbox on first-run should be
 // initially checked. Opt-in means it is not initially checked, opt-out means it
 // is. This is not guaranteed to be correct outside of the first-run situation,
@@ skipping 25 matching lines @@
 // exactly once, so that the browser loads the welcome tab once the
 // message loop gets going.
 void SetShouldShowWelcomePage();
 
 // Returns true if the welcome page should be shown.
 //
 // This will return true only once: The first time it is called after
 // 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.
 void SetShouldDoPersonalDataManagerFirstRun();
 
 // Returns true if the autofill personal data manager first-run action
 // should be taken.
 //
 // This will return true only once, the first time it is called after
 // SetShouldDoPersonalDataManagerFirstRun() is called.
@@ skipping 37 matching lines @@
 //
 // See chrome/installer/util/master_preferences.h for a description of
 // 'master_preferences' file.
 ProcessMasterPreferencesResult ProcessMasterPreferences(
     const base::FilePath& user_data_dir,
     MasterPrefs* out_prefs);
 
 }  // namespace first_run
 
 #endif  // CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_