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

chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc

Index: chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
diff --git a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
index c9c0f2eb56dcab8603f3e2d91b0187126f4688a0..87751b8510bd58a541e80f0b6f7bb3f148f1420b 100644
--- a/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
+++ b/chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc
@@ -280,7 +280,7 @@ TEST(CapabilitiesParser, ExcludeSwitches) {
   dict.Set("chromeOptions", options);
 
   ListValue* switches = new ListValue();
-  switches->Append(new base::StringValue(switches::kNoFirstRun));
+  switches->Append(new base::StringValue(switches::kSkipFirstRun));
   switches->Append(new base::StringValue(switches::kDisableSync));
   switches->Append(new base::StringValue(switches::kDisableTranslate));
   options->Set("excludeSwitches", switches);
@@ -291,7 +291,7 @@ TEST(CapabilitiesParser, ExcludeSwitches) {
 
   const std::set<std::string>& rm_set = caps.exclude_switches;
   EXPECT_EQ(static_cast<size_t>(3), rm_set.size());
-  ASSERT_TRUE(rm_set.find(switches::kNoFirstRun) != rm_set.end());
+  ASSERT_TRUE(rm_set.find(switches::kSkipFirstRun) != rm_set.end());
   ASSERT_TRUE(rm_set.find(switches::kDisableSync) != rm_set.end());
   ASSERT_TRUE(rm_set.find(switches::kDisableTranslate) != rm_set.end());
 }