Add support for multiple simultaneous subresource_filter::Configurations.

chrome/browser/component_updater/subresource_filter_component_installer.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 "chrome/browser/component_updater/subresource_filter_component_installer.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 94 matching lines @@
     std::vector<uint8_t>* hash) const {
   hash->assign(std::begin(kPublicKeySHA256), std::end(kPublicKeySHA256));
 }
 
 std::string SubresourceFilterComponentInstallerTraits::GetName() const {
   return kSubresourceFilterSetFetcherManifestName;
 }
 
 // static
 std::string SubresourceFilterComponentInstallerTraits::GetInstallerTag() {
-  const auto configurations = subresource_filter::GetActiveConfigurations();
-  const std::string& ruleset_flavor =
-      configurations->the_one_and_only().ruleset_flavor;
+  const std::string ruleset_flavor =
+      subresource_filter::GetEnabledConfigurations()
+          ->GetMostSpecificRulesetFlavor();
+
   if (ruleset_flavor.empty())
     return ruleset_flavor;
 
-  // We allow 4 ruleset flavor identifiers: a, b, c, d
+  // In addition to "", we allow 4 ruleset flavor identifiers: a, b, c, d.

[Charlie Harrison, 2017/05/03 14:52:17]

Move this comment above the empty() check.

[engedy, 2017/05/05 12:25:41]

Done.

   if (ruleset_flavor.size() == 1 && ruleset_flavor.at(0) >= 'a' &&
       ruleset_flavor.at(0) <= 'd') {
     return ruleset_flavor;
   }
 
   // Return 'invalid' for any cases where we encounter an invalid installer
   // tag. This allows us to verify that no clients are encountering invalid
   // installer tags in the field.
   return "invalid";
 }
@@ skipping 19 matching lines @@
   }
   std::unique_ptr<ComponentInstallerTraits> traits(
       new SubresourceFilterComponentInstallerTraits());
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 }
 
 }  // namespace component_updater