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

chrome_frame/chrome_frame_automation.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/chrome_frame_automation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 249 matching lines @@
   if (chrome_launcher::CreateLaunchCommandLine(&command_line)) {
     command_line->AppendSwitchASCII(switches::kAutomationClientChannelID,
                                     channel_id);
 
     // Run Chrome in Chrome Frame mode. In practice, this modifies the paths
     // and registry keys that Chrome looks in via the BrowserDistribution
     // mechanism.
     command_line->AppendSwitch(switches::kChromeFrame);
 
     // Chrome Frame never wants Chrome to start up with a First Run UI.
-    command_line->AppendSwitch(switches::kNoFirstRun);
+    command_line->AppendSwitch(switches::kSkipFirstRun);

[grt (UTC plus 2), 2013/07/30 02:48:16]

GCF uses a different user data dir than Chrome, so there is no concern that a
subsequent Chrome execution would miss going through first-run. With that in
mind, this should be kCancelFirstRun to maintain existing behavior.

[gab, 2013/07/30 14:10:17]

Actually, for user-level the First Run beacon is dropped by chrome.exe so that
argument doesn't apply...

[grt (UTC plus 2), 2013/07/30 14:21:11]

Ah. Right you are, sir. The beacon is put in the Application dir for user-level,
so it doesn't make sense that GCF would prevent user-level Chrome from going
through first run.

 
     // Chrome Frame never wants to run background extensions since they
     // interfere with in-use updates.
     command_line->AppendSwitch(switches::kDisableBackgroundMode);
 
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
 
 #if defined(GOOGLE_CHROME_BUILD)
     // Chrome Frame should use the native print dialog.
     command_line->AppendSwitch(switches::kDisablePrintPreview);
@@ skipping 1005 matching lines @@
     const net::URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(
       tab_->handle(), request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(
       tab_->handle(), success, url, cookie_string, cookie_id));
 }