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

chrome/browser/process_singleton_browsertest.cc

Index: chrome/browser/process_singleton_browsertest.cc
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc
index ad09a1c015d798684c5941b0514cdfca0361d3bf..1551ee0d72348cbbec77ee87019500edce45653d 100644
--- a/chrome/browser/process_singleton_browsertest.cc
+++ b/chrome/browser/process_singleton_browsertest.cc
@@ -67,7 +67,7 @@ class ChromeStarter : public base::RefCountedThreadSafe<ChromeStarter> {
     if (first_run)
       command_line.AppendSwitch(switches::kForceFirstRun);
     else
-      command_line.AppendSwitch(switches::kNoFirstRun);
+      command_line.AppendSwitch(switches::kSkipFirstRun);
 
     // Add the normal test-mode switches, except for the ones we're adding
     // ourselves.
@@ -79,7 +79,7 @@ class ChromeStarter : public base::RefCountedThreadSafe<ChromeStarter> {
       const std::string& switch_name = i->first;
       if (switch_name == switches::kUserDataDir ||
           switch_name == switches::kForceFirstRun ||
-          switch_name == switches::kNoFirstRun)
+          switch_name == switches::kSkipFirstRun)
         continue;
 
       command_line.AppendSwitchNative(switch_name, i->second);