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

chrome/browser/first_run/first_run.cc

 // 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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 451 matching lines @@
       make_chrome_default(false),
       suppress_first_run_default_browser_prompt(false) {
 }
 
 MasterPrefs::~MasterPrefs() {}
 
 bool IsChromeFirstRun() {
   if (internal::first_run_ != internal::FIRST_RUN_UNKNOWN)
     return internal::first_run_ == internal::FIRST_RUN_TRUE;
 
+  enum FirstRunState {
+    CANCEL_FIRST_RUN,
+    NOT_FIRST_RUN,
+    IS_FIRST_RUN,
+  };
+
+  FirstRunState first_run_state = NOT_FIRST_RUN;
+
   base::FilePath first_run_sentinel;
-  if (!internal::GetFirstRunSentinelFilePath(&first_run_sentinel) ||
-      base::PathExists(first_run_sentinel)) {
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kForceFirstRun)) {
+    first_run_state = IS_FIRST_RUN;
+  } else if (command_line->HasSwitch(switches::kNoFirstRun)) {
+    first_run_state = CANCEL_FIRST_RUN;
+  } else if (internal::GetFirstRunSentinelFilePath(&first_run_sentinel) &&
+             !base::PathExists(first_run_sentinel)) {
+    first_run_state = IS_FIRST_RUN;
+  }
+
+  if (first_run_state == IS_FIRST_RUN || first_run_state == CANCEL_FIRST_RUN)
+    CreateSentinel();

[cpu_(ooo_6.6-7.5), 2013/07/27 21:16:31]

yeah it would be ideal if we don't create the sentinel when kNoFirstRun,
hopefully tests don't explode.

[gab, 2013/07/29 17:39:50]

It always has, but I agree that it would make sense to have --no-first-run do
what you think it should do and --cancel-first-run as a stronger flag when
cancelling first run is actually desired.

I'll look into that as a follow-up CL.

+
+  if (first_run_state == IS_FIRST_RUN) {
+    internal::first_run_ = internal::FIRST_RUN_TRUE;
+    return true;
+  } else {
     internal::first_run_ = internal::FIRST_RUN_FALSE;
     return false;
   }
-  internal::first_run_ = internal::FIRST_RUN_TRUE;
-  return true;
 }
 
 bool CreateSentinel() {
   base::FilePath first_run_sentinel;
   if (!internal::GetFirstRunSentinelFilePath(&first_run_sentinel))
     return false;
   return file_util::WriteFile(first_run_sentinel, "", 0) != -1;
 }
 
 std::string GetPingDelayPrefName() {
@@ skipping 139 matching lines @@
 
 void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs) {
   internal::master_prefs_path_for_testing.Get() = master_prefs;
 }
 
 ProcessMasterPreferencesResult ProcessMasterPreferences(
     const base::FilePath& user_data_dir,
     MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
 
-#if defined(OS_CHROMEOS)
-  // Chrome OS has its own out-of-box-experience code.  Create the sentinel to
-  // mark the fact that we've run once but skip the full first-run flow.
-  CreateSentinel();
-  return SKIP_FIRST_RUN_TASKS;
-#endif
-
   base::FilePath master_prefs_path;
   scoped_ptr<installer::MasterPreferences>
       install_prefs(internal::LoadMasterPrefs(&master_prefs_path));
 
   // Default value in case master preferences is missing or corrupt, or
   // ping_delay is missing.
   out_prefs->ping_delay = 90;
   if (install_prefs.get()) {
     if (!internal::ShowPostInstallEULAIfNeeded(install_prefs.get()))
       return EULA_EXIT_NOW;
 
     if (!internal::CopyPrefFile(user_data_dir, master_prefs_path))
       DLOG(ERROR) << "Failed to copy master_preferences to user data dir.";
 
     DoDelayedInstallExtensionsIfNeeded(install_prefs.get());
 
     internal::SetupMasterPrefsFromInstallPrefs(*install_prefs, out_prefs);
 
     internal::SetDefaultBrowser(install_prefs.get());
   }
 
-  return DO_FIRST_RUN_TASKS;
+  return FIRST_RUN_PROCEED;
 }
 
 void AutoImport(
     Profile* profile,
     bool homepage_defined,
     int import_items,
     int dont_import_items,
     const std::string& import_bookmarks_path) {
   // Deletes itself.
   ExternalProcessImporterHost* importer_host = new ExternalProcessImporterHost;
@@ skipping 92 matching lines @@
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks(profile);
 }
 
 uint16 auto_import_state() {
   return g_auto_import_state;
 }
 
 }  // namespace first_run