add flags to recovery executable.

chrome/browser/component_updater/recovery_component_installer.cc

Index: chrome/browser/component_updater/recovery_component_installer.cc
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc
index 2563b103c3d256df62194efce880ff9ca1433ee5..cfbd0874d7bed0fae1edd2cb5bcce449ef9cb8f9 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -133,13 +133,20 @@ void DoElevatedInstallRecoveryComponent(const base::FilePath& path) {
     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);
@@ -339,7 +346,9 @@ bool RecoveryComponentInstaller::Install(const base::DictionaryValue& manifest,
   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)) {