add flags to recovery executable.

chrome/browser/component_updater/recovery_component_installer.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/browser/component_updater/recovery_component_installer.h"
 
 #include <stdint.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 115 matching lines @@
   manifest->GetStringASCII("name", &name);
   if (name != kRecoveryManifestName)
     return;
   std::string proposed_version;
   manifest->GetStringASCII("version", &proposed_version);
   const Version version(proposed_version.c_str());
   if (!version.IsValid())
     return;
 
   base::CommandLine cmdline(main_file);
+
+  // Add a flag to indicate this is a re-attempted install so that the recovery
+  // executable can report back accordingly.
+  cmdline.AppendArg("/deferredrun");
+
   std::string arguments;
   if (manifest->GetStringASCII("x-recovery-args", &arguments))
     cmdline.AppendArg(arguments);
   std::string add_version;
   if (manifest->GetStringASCII("x-recovery-add-version", &add_version) &&
       add_version == "yes") {
-    cmdline.AppendSwitchASCII("version", version.GetString());
+    std::string version_string = "/version ";
+    version_string += version.GetString();
+    cmdline.AppendArg(version_string);
   }
 
   RecordRecoveryComponentUMAEvent(RCE_RUNNING_ELEVATED);
 
   base::LaunchOptions options;
   options.start_hidden = true;
   base::Process process = base::LaunchElevatedProcess(cmdline, options);
 
   base::WorkerPool::PostTask(
       FROM_HERE,
@@ skipping 179 matching lines @@
   if (!base::PathExists(main_file))
     return false;
   // Run the recovery component.
   base::CommandLine cmdline(main_file);
   std::string arguments;
   if (manifest.GetStringASCII("x-recovery-args", &arguments))
     cmdline.AppendArg(arguments);
   std::string add_version;
   if (manifest.GetStringASCII("x-recovery-add-version", &add_version) &&
       add_version == "yes") {
-    cmdline.AppendSwitchASCII("version", current_version_.GetString());
+    std::string version_string = "/version ";

[Sorin Jianu, 2015/05/16 00:19:11]

As discussed, we could factor this out as a function.

[xiaoling, 2015/05/16 01:20:09]

Done.

+    version_string += current_version_.GetString();
+    cmdline.AppendArg(version_string);
   }
 
   if (!RunInstallCommand(cmdline, path)) {
     return false;
   }
 
   current_version_ = version;
   if (prefs_) {
     BrowserThread::PostTask(
         BrowserThread::UI,
@@ skipping 49 matching lines @@
 #endif  // OS_WIN
   prefs->SetBoolean(prefs::kRecoveryComponentNeedsElevation, false);
 }
 
 void DeclinedElevatedRecoveryInstall(PrefService* prefs) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   prefs->SetBoolean(prefs::kRecoveryComponentNeedsElevation, false);
 }
 
 }  // namespace component_updater