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

chrome_frame/test/chrome_frame_test_utils.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 "chrome_frame/test/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 179 matching lines @@
   return process;
 }
 
 base::ProcessHandle LaunchChrome(const std::wstring& url,
                                  const base::FilePath& user_data_dir) {
   base::FilePath path;
   PathService::Get(base::DIR_MODULE, &path);
   path = path.AppendASCII(kChromeImageName);
 
   CommandLine cmd(path);
-  cmd.AppendSwitch(switches::kNoFirstRun);
+  cmd.AppendSwitch(switches::kSkipFirstRun);
   if (!user_data_dir.empty())
     cmd.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
   cmd.AppendArgNative(url);
 
   base::ProcessHandle process = NULL;
   base::LaunchProcess(cmd, base::LaunchOptions(), &process);
   return process;
 }
 
 base::ProcessHandle LaunchIEOnVista(const std::wstring& url) {
@@ skipping 529 matching lines @@
   if (address.empty()) {
     LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be "
                << "run over the loopback adapter, which may result in hangs.";
     address.assign("127.0.0.1");
   }
 
   return address;
 }
 
 }  // namespace chrome_frame_test