Introduce --cancel-first-run and reduce the strength of --no-first-run.

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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 
+class CommandLine;
 class GURL;
 class Profile;
 
 namespace base {
 class FilePath;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
@@ skipping 54 matching lines @@
   std::vector<GURL> new_tabs;
   std::vector<GURL> bookmarks;
   std::string import_bookmarks_path;
   std::string variations_seed;
   std::string suppress_default_browser_prompt_for_version;
 };
 
 // Returns true if this is the first time chrome is run for this user.
 bool IsChromeFirstRun();
 
+// Returns true if |command_line|'s switches explicitly specify that first run
+// should be suppressed in the current run.
+bool IsFirstRunSuppressed(const CommandLine& command_line);
+
 // Creates the first run sentinel if needed. This should only be called after
 // the process singleton has been grabbed by the current process
 // (http://crbug.com/264694).
 void CreateSentinelIfNeeded();
 
 // Get RLZ ping delay pref name.
 std::string GetPingDelayPrefName();
 
 // Register user preferences used by the MasterPrefs structure.
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ skipping 68 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_