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

cloud_print/service/win/chrome_launcher.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 "cloud_print/service/win/chrome_launcher.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 216 matching lines @@
       cmd.AppendSwitch(switches::kNoServiceAutorun);
 
       // Optional.
       cmd.AppendSwitch(switches::kAutoLaunchAtStartup);
       cmd.AppendSwitch(switches::kDisableBackgroundMode);
       cmd.AppendSwitch(switches::kDisableDefaultApps);
       cmd.AppendSwitch(switches::kDisableExtensions);
       cmd.AppendSwitch(switches::kDisableGpu);
       cmd.AppendSwitch(switches::kDisableSoftwareRasterizer);
       cmd.AppendSwitch(switches::kDisableSync);
-      cmd.AppendSwitch(switches::kNoFirstRun);
+      cmd.AppendSwitch(switches::kSkipFirstRun);
       cmd.AppendSwitch(switches::kNoStartupWindow);
 
       base::win::ScopedHandle chrome_handle;
       base::Time started = base::Time::Now();
       DWORD thread_id = 0;
       LaunchProcess(cmd, chrome_handle.Receive(), &thread_id);
 
       HANDLE handles[] = {stop_event_.handle(), chrome_handle};
       DWORD wait_result = WAIT_TIMEOUT;
       while (wait_result == WAIT_TIMEOUT) {
@@ skipping 56 matching lines @@
   cmd.AppendSwitchPath(switches::kUserDataDir, temp_user_data.path());
   cmd.AppendSwitchPath(switches::kCloudPrintSetupProxy, printers_file);
   cmd.AppendSwitch(switches::kNoServiceAutorun);
 
   // Optional.
   cmd.AppendSwitch(switches::kDisableBackgroundMode);
   cmd.AppendSwitch(switches::kDisableDefaultApps);
   cmd.AppendSwitch(switches::kDisableExtensions);
   cmd.AppendSwitch(switches::kDisableSync);
   cmd.AppendSwitch(switches::kNoDefaultBrowserCheck);
-  cmd.AppendSwitch(switches::kNoFirstRun);
+  cmd.AppendSwitch(switches::kSkipFirstRun);
 
   cmd.AppendArg(GetCloudPrintServiceEnableURLWithSignin(proxy_id).spec());
 
   base::win::ScopedHandle chrome_handle;
   DWORD thread_id = 0;
   if (!LaunchProcess(cmd, chrome_handle.Receive(), &thread_id)) {
     LOG(ERROR) << "Unable to launch Chrome.";
     return result;
   }
 
@@ skipping 12 matching lines @@
       }
     } else {
       LOG(ERROR) << "Chrome launch failed.";
       return result;
     }
   }
   NOTREACHED();
   return std::string();
 }