commit 2adb2caddbc95ffd35cc9b2713f075d93d9b9d46
author sorin <sorin@chromium.org> Wed Jun 29 01:44:35 2016
committer Commit bot <commit-bot@chromium.org> Wed Jun 29 01:47:47 2016
tree c90df11fa440610e6899e1f77af219570769f271
parent 1286dbd329b0669e082ffcebe3cb2b7fa47e438d

This is a mechanical change.

Allow component installers to specify a map of installer attributes to be used in the update check requests.

This change extends the mechanism to specify "ap" in such a way that a map of name-value pairs can be returned by the component installer which need this capability.

R=waffles
BUG=599703

Review-Url: https://codereview.chromium.org/2102083002
Cr-Commit-Position: refs/heads/master@{#402632}

components/component_updater/default_component_installer_unittest.cc

diff --git a/components/component_updater/default_component_installer_unittest.cc b/components/component_updater/default_component_installer_unittest.cc
index 63038f07..184ef2b 100644
--- a/components/component_updater/default_component_installer_unittest.cc
+++ b/components/component_updater/default_component_installer_unittest.cc
@@ -42,7 +42,7 @@
 
 class MockUpdateClient : public UpdateClient {
  public:
-  MockUpdateClient() {};
+  MockUpdateClient() {}
   MOCK_METHOD1(AddObserver, void(Observer* observer));
   MOCK_METHOD1(RemoveObserver, void(Observer* observer));
   MOCK_METHOD3(Install,
@@ -61,7 +61,7 @@
                void(const std::string& id, const Version& version, int reason));
 
  private:
-  ~MockUpdateClient() override {};
+  ~MockUpdateClient() override {}
 };
 
 class FakeInstallerTraits : public ComponentInstallerTraits {
@@ -95,7 +95,12 @@
 
   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) {
@@ -203,13 +208,18 @@
   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);
 }