component_updater: add '_env_version' attribute for cros_component_installer

chrome/browser/component_updater/cros_component_installer.cc

 // Copyright 2017 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/cros_component_installer.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_installer_errors.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/crx_file/id_util.h"
@@ skipping 33 matching lines @@
 
   if (loader) {
     loader->RegisterComponent(name, version, install_dir.value(),
                               base::Bind(&LogRegistrationResult, name));
   } else {
     DVLOG(1) << "Failed to get ImageLoaderClient object.";
   }
 }
 
 ComponentConfig::ComponentConfig(const std::string& name,
-                                 const std::string& dir,
+                                 const std::string& env_version,
                                  const std::string& sha2hashstr)
-    : name(name), dir(dir), sha2hashstr(sha2hashstr) {}
+    : name(name), env_version(env_version), sha2hashstr(sha2hashstr) {}
 ComponentConfig::~ComponentConfig() {}
 
 CrOSComponentInstallerTraits::CrOSComponentInstallerTraits(
     const ComponentConfig& config)
-    : dir_name(config.dir), name(config.name) {
+    : name(config.name), env_version(config.env_version) {
   if (config.sha2hashstr.length() != 64)
     return;
   auto strstream = config.sha2hashstr;
   for (auto& cell : kSha2Hash_) {
     cell = stoul(strstream.substr(0, 2), nullptr, 16);
     strstream.erase(0, 2);
   }
 }
 
 bool CrOSComponentInstallerTraits::SupportsGroupPolicyEnabledComponentUpdates()
@@ skipping 25 matching lines @@
     const base::FilePath& path,
     std::unique_ptr<base::DictionaryValue> manifest) {}
 
 bool CrOSComponentInstallerTraits::VerifyInstallation(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) const {
   return true;
 }
 
 base::FilePath CrOSComponentInstallerTraits::GetRelativeInstallDir() const {
-  return base::FilePath(dir_name);
+  return base::FilePath(name);
 }
 
 void CrOSComponentInstallerTraits::GetHash(std::vector<uint8_t>* hash) const {
   hash->assign(kSha2Hash_, kSha2Hash_ + arraysize(kSha2Hash_));
 }
 
 std::string CrOSComponentInstallerTraits::GetName() const {
   return name;
 }
 
 update_client::InstallerAttributes
 CrOSComponentInstallerTraits::GetInstallerAttributes() const {
-  return update_client::InstallerAttributes();
+  update_client::InstallerAttributes attrs;
+  attrs["_env_version"] = env_version;
+  return attrs;
 }
 
 std::vector<std::string> CrOSComponentInstallerTraits::GetMimeTypes() const {
   std::vector<std::string> mime_types;
   return mime_types;
 }
 
 void CrOSComponent::RegisterCrOSComponentInternal(
     ComponentUpdateService* cus,
     const ComponentConfig& config,
@@ skipping 12 matching lines @@
     const std::string& id,
     const update_client::Callback& install_callback) {
   cus->GetOnDemandUpdater().OnDemandUpdate(id, install_callback);
 }
 
 bool CrOSComponent::InstallCrOSComponent(
     const std::string& name,
     const update_client::Callback& install_callback) {
   auto* const cus = g_browser_process->component_updater();
   const ConfigMap components = {
-      {"escpr",
-       {{"dir", "epson-inkjet-printer-escpr"},
+      {"epson-inkjet-printer-escpr",
+       {{"env_version", "0.0"},
         {"sha2hashstr",
          "1913a5e0a6cad30b6f03e176177e0d7ed62c5d6700a9c66da556d7c3f5d6a47e"}}}};
   if (name.empty()) {
     base::PostTask(
         FROM_HERE,
         base::Bind(install_callback, update_client::Error::INVALID_ARGUMENT));
     return false;
   }
   const auto it = components.find(name);
   if (it == components.end()) {
     DVLOG(1) << "[RegisterCrOSComponents] component " << name
              << " is not in configuration.";
     base::PostTask(
         FROM_HERE,
         base::Bind(install_callback, update_client::Error::INVALID_ARGUMENT));
     return false;
   }
-  ComponentConfig config(it->first, it->second.find("dir")->second,
+  ComponentConfig config(it->first, it->second.find("env_version")->second,
                          it->second.find("sha2hashstr")->second);
   RegisterCrOSComponentInternal(
       cus, config,
       base::Bind(InstallChromeOSComponent, cus,
                  crx_file::id_util::GenerateIdFromHex(
                      it->second.find("sha2hashstr")->second)
                      .substr(0, 32),
                  install_callback));
   return true;
 }
@@ skipping 21 matching lines @@
       chromeos::DBusThreadManager::Get()->GetImageLoaderClient();
   if (loader) {
     loader->LoadComponent(name, base::Bind(&MountResult, mount_callback));
   } else {
     DVLOG(1) << "Failed to get ImageLoaderClient object.";
   }
 }
 #endif  // defined(OS_CHROMEOS
 
 }  // namespace component_updater