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

chrome/test/base/test_launcher_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/test/base/test_launcher_utils.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 
 void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // Turn off tip loading for tests; see http://crbug.com/17725.
   command_line->AppendSwitch(switches::kDisableWebResources);
 
   // Turn off preconnects because they break the brittle python webserver;
   // see http://crbug.com/60035.
   command_line->AppendSwitch(switches::kDisablePreconnect);
 
   // Don't show the first run ui.
-  command_line->AppendSwitch(switches::kNoFirstRun);
+  command_line->AppendSwitch(switches::kSkipFirstRun);
 
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line->AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // Enable info level logging to stderr by default so that we can see when
   // bad stuff happens, but honor the flags specified from the command line.
   if (!command_line->HasSwitch(switches::kEnableLogging))
     command_line->AppendSwitchASCII(switches::kEnableLogging, "stderr");
   if (!command_line->HasSwitch(switches::kLoggingLevel))
@@ skipping 58 matching lines @@
                               const std::string& implementation_name) {
   if (command_line->HasSwitch(switches::kUseGL))
     return false;
 
   command_line->AppendSwitchASCII(switches::kUseGL, implementation_name);
 
   return true;
 }
 
 }  // namespace test_launcher_utils