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

chrome/browser/process_singleton_browsertest.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.
 
 // This test validates that the ProcessSingleton class properly makes sure
 // that there is only one main browser process.
 //
 // It is currently compiled and run on Windows and Posix(non-Mac) platforms.
 // Mac uses system services and ProcessSingletonMac is a noop.  (Maybe it still
 // makes sense to test that the system services are giving the behavior we
@@ skipping 49 matching lines @@
     // TODO(mattm): maybe stuff should be refactored to use
     // UITest::LaunchBrowserHelper somehow?
     base::FilePath program;
     ASSERT_TRUE(PathService::Get(base::FILE_EXE, &program));
     CommandLine command_line(program);
     command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir_);
 
     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.
     CommandLine standard_switches(CommandLine::NO_PROGRAM);
     test_launcher_utils::PrepareBrowserCommandLineForTests(&standard_switches);
     const CommandLine::SwitchMap& switch_map = standard_switches.GetSwitches();
     for (CommandLine::SwitchMap::const_iterator i = switch_map.begin();
          i != switch_map.end(); ++i) {
       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);
     }
 
     // Try to get all threads to launch the app at the same time.
     // So let the test know we are ready.
     ready_event_.Signal();
     // And then wait for the test to tell us to GO!
     ASSERT_NE(static_cast<base::WaitableEvent*>(NULL), start_event);
@@ skipping 224 matching lines @@
     ASSERT_EQ(static_cast<size_t>(1), pending_starters.size());
     size_t last_index = pending_starters.front();
     pending_starters.clear();
     if (chrome_starters_[last_index]->process_handle_ !=
         base::kNullProcessHandle) {
       KillProcessTree(chrome_starters_[last_index]->process_handle_);
       chrome_starters_[last_index]->done_event_.Wait();
     }
   }
 }