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

chrome_frame/chrome_launcher_unittest.cc

Index: chrome_frame/chrome_launcher_unittest.cc
diff --git a/chrome_frame/chrome_launcher_unittest.cc b/chrome_frame/chrome_launcher_unittest.cc
index b1022db66f028b28280b7de69f42ad21fa57bc34..7a67f6fb820cbc12476b0b55ddbffb10d3fa874d 100644
--- a/chrome_frame/chrome_launcher_unittest.cc
+++ b/chrome_frame/chrome_launcher_unittest.cc
@@ -10,7 +10,7 @@
 
 TEST(ChromeLauncher, IsValidCommandLine) {
   CommandLine bad(base::FilePath(L"dummy.exe"));
-  bad.AppendSwitch(switches::kNoFirstRun);  // in whitelist
+  bad.AppendSwitch(switches::kSkipFirstRun);  // in whitelist
   bad.AppendSwitch("no-such-switch");  // does not exist
   bad.AppendSwitch(switches::kHomePage);  // exists but not in whitelist
 
@@ -18,7 +18,7 @@ TEST(ChromeLauncher, IsValidCommandLine) {
       bad.GetCommandLineString().c_str()));
 
   CommandLine good(base::FilePath(L"dummy.exe"));
-  good.AppendSwitch(switches::kNoFirstRun);  // in whitelist
+  good.AppendSwitch(switches::kSkipFirstRun);  // in whitelist
   good.AppendSwitch(switches::kDisableBackgroundMode);  // in whitelist
   good.AppendSwitchASCII(switches::kUserDataDir, "foo");  // in whitelist