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

chrome/browser/chrome_browser_main_mac.mm

Index: chrome/browser/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 3d41c65528f70eac05f7fbf57f81dd023ae72741..7478f9bf06bea3433be2bc960c8d0e81181b3e40 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -229,7 +229,7 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
   [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone];
 
   // Disk image installation is sort of a first-run task, so it shares the
-  // kNoFirstRun switch.
+  // no first run switches.
   //
   // This needs to be done after the resource bundle is initialized (for
   // access to localizations in the UI) and after Keystone is initialized
@@ -240,7 +240,8 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
   // anyone tries doing anything silly like firing off an import job, and
   // before anything creating preferences like Local State in order for the
   // relaunched installed application to still consider itself as first-run.
-  if (!parsed_command_line().HasSwitch(switches::kNoFirstRun)) {
+  if (!parsed_command_line().HasSwitch(switches::kCancelFirstRun) &&

[grt (UTC plus 2), 2013/07/30 02:48:16]

how about abstracting the tests for flags away into a helper:
  if (!first_run::IsFirstRunSuppressed(parsed_command_line())) {
    ...
  }

[gab, 2013/07/30 14:10:17]

Done.

+      !parsed_command_line().HasSwitch(switches::kSkipFirstRun)) {
     if (MaybeInstallFromDiskImage()) {
       // The application was installed and the installed copy has been
       // launched.  This process is now obsolete.  Exit.