Allow component installers to specify a map of installer attributes.

components/component_updater/default_component_installer_unittest.cc

 // Copyright 2016 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 <iterator>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 24 matching lines @@
 namespace {
 
 // This hash corresponds to jebgalgnebhfojomionfpkfelancnnkf.crx.
 const uint8_t kSha256Hash[] = {0x94, 0x16, 0x0b, 0x6d, 0x41, 0x75, 0xe9, 0xec,
                                0x8e, 0xd5, 0xfa, 0x54, 0xb0, 0xd2, 0xdd, 0xa5,
                                0x6e, 0x05, 0x6b, 0xe8, 0x73, 0x47, 0xf6, 0xc4,
                                0x11, 0x9f, 0xbc, 0xb3, 0x09, 0xb3, 0x5b, 0x40};
 
 class MockUpdateClient : public UpdateClient {
  public:
-  MockUpdateClient() {};
+  MockUpdateClient() {}
   MOCK_METHOD1(AddObserver, void(Observer* observer));
   MOCK_METHOD1(RemoveObserver, void(Observer* observer));
   MOCK_METHOD3(Install,
                void(const std::string& id,
                     const CrxDataCallback& crx_data_callback,
                     const CompletionCallback& completion_callback));
   MOCK_METHOD3(Update,
                void(const std::vector<std::string>& ids,
                     const CrxDataCallback& crx_data_callback,
                     const CompletionCallback& completion_callback));
   MOCK_CONST_METHOD2(GetCrxUpdateState,
                      bool(const std::string& id, CrxUpdateItem* update_item));
   MOCK_CONST_METHOD1(IsUpdating, bool(const std::string& id));
   MOCK_METHOD0(Stop, void());
   MOCK_METHOD3(SendUninstallPing,
                void(const std::string& id, const Version& version, int reason));
 
  private:
-  ~MockUpdateClient() override {};
+  ~MockUpdateClient() override {}
 };
 
 class FakeInstallerTraits : public ComponentInstallerTraits {
  public:
   ~FakeInstallerTraits() override {}
 
   bool VerifyInstallation(const base::DictionaryValue& manifest,
                           const base::FilePath& dir) const override {
     return true;
   }
@@ skipping 13 matching lines @@
       std::unique_ptr<base::DictionaryValue> manifest) override {}
 
   base::FilePath GetRelativeInstallDir() const override {
     return base::FilePath(FILE_PATH_LITERAL("fake"));
   }
 
   void GetHash(std::vector<uint8_t>* hash) const override { GetPkHash(hash); }
 
   std::string GetName() const override { return "fake name"; }
 
-  std::string GetAp() const override { return "fake-ap"; }
+  update_client::InstallerAttributes GetInstallerAttributes() const override {
+    update_client::InstallerAttributes installer_attributes;
+    installer_attributes["ap"] = "fake-ap";
+    installer_attributes["is-enterprise"] = "1";
+    return installer_attributes;
+  }
 
  private:
   static void GetPkHash(std::vector<uint8_t>* hash) {
     hash->assign(std::begin(kSha256Hash), std::end(kSha256Hash));
   }
 };
 
 class DefaultComponentInstallerTest : public testing::Test {
  public:
   DefaultComponentInstallerTest();
@@ skipping 87 matching lines @@
 
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(component_updater(), base::Closure());
 
   RunThreads();
 
   CrxUpdateItem item;
   EXPECT_TRUE(component_updater()->GetComponentDetails(id, &item));
   const CrxComponent& component(item.component);
+
+  update_client::InstallerAttributes expected_attrs;
+  expected_attrs["ap"] = "fake-ap";
+  expected_attrs["is-enterprise"] = "1";
+
   EXPECT_EQ(
       std::vector<uint8_t>(std::begin(kSha256Hash), std::end(kSha256Hash)),
       component.pk_hash);
   EXPECT_EQ(base::Version("0.0.0.0"), component.version);
   EXPECT_TRUE(component.fingerprint.empty());
   EXPECT_STREQ("fake name", component.name.c_str());
-  EXPECT_STREQ("fake-ap", component.ap.c_str());
+  EXPECT_EQ(expected_attrs, component.installer_attributes);
   EXPECT_TRUE(component.requires_network_encryption);
 }
 
 }  // namespace component_updater