Chromium Code Reviews| Index: chrome/browser/component_updater/subresource_filter_component_installer.cc |
| diff --git a/chrome/browser/component_updater/subresource_filter_component_installer.cc b/chrome/browser/component_updater/subresource_filter_component_installer.cc |
| index 5016878ec0a13b95fea2a6f541acf3b5f0df1804..fb68e623e715e0b9eda3b17a9b5e21ae80d0ac91 100644 |
| --- a/chrome/browser/component_updater/subresource_filter_component_installer.cc |
| +++ b/chrome/browser/component_updater/subresource_filter_component_installer.cc |
| @@ -112,13 +112,14 @@ std::string SubresourceFilterComponentInstallerTraits::GetName() const { |
| // 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; |