Refactor how the updater state data is serialized in update checks.

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 aca11bba95459131121aa41600ac061c70374155..7128ff4b7341b5fec47953d083010988cf34e210 100644
--- a/chrome/browser/component_updater/recovery_component_installer.cc
+++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -26,9 +26,6 @@
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#if defined(OS_WIN)
-#include "chrome/installer/util/install_util.h"
-#endif  // OS_WIN
 #include "components/component_updater/component_updater_paths.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/component_updater/pref_names.h"
@@ -235,15 +232,6 @@ void RecoveryRegisterHelper(ComponentUpdateService* cus, PrefService* prefs) {
     NOTREACHED();
     return;
   }
-
-  update_client::InstallerAttributes installer_attributes;
-#if defined(OS_WIN)
-  base::FilePath exe_path;
-  PathService::Get(base::FILE_EXE, &exe_path);
-  installer_attributes["ismachine"] =
-      InstallUtil::IsPerUserInstall(exe_path) ? "0" : "1";
-#endif  // OS_WIN
-
   update_client::CrxComponent recovery;
   recovery.name = "recovery";
   recovery.installer = new RecoveryComponentInstaller(version, prefs);
@@ -251,7 +239,6 @@ void RecoveryRegisterHelper(ComponentUpdateService* cus, PrefService* prefs) {
   recovery.pk_hash.assign(kSha2Hash, &kSha2Hash[sizeof(kSha2Hash)]);
   recovery.supports_group_policy_enable_component_updates = true;
   recovery.requires_network_encryption = false;
-  recovery.installer_attributes = installer_attributes;
   if (!cus->RegisterComponent(recovery)) {
     NOTREACHED() << "Recovery component registration failed.";
   }