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

chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc

 // 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.
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/values.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 262 matching lines @@
   options->SetInteger("driver", kInfoLogLevel);
   ASSERT_TRUE(parser.Parse());
 }
 
 TEST(CapabilitiesParser, ExcludeSwitches) {
   DictionaryValue dict;
   DictionaryValue* options = new DictionaryValue();
   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);
 
   Capabilities caps;
   CapabilitiesParser parser(&dict, base::FilePath(), Logger(), &caps);
   ASSERT_FALSE(parser.Parse());
 
   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());
 }
 
 }  // namespace webdriver