| Index: extensions/common/features/complex_feature.cc
|
| diff --git a/extensions/common/features/complex_feature.cc b/extensions/common/features/complex_feature.cc
|
| index 9a330c1ff64166e83d4c752d8086c518d9549253..e600ff59712cae233cc7f653db44699fdd7d6aa9 100644
|
| --- a/extensions/common/features/complex_feature.cc
|
| +++ b/extensions/common/features/complex_feature.cc
|
| @@ -32,20 +32,21 @@ ComplexFeature::~ComplexFeature() {
|
|
|
| Feature::Availability ComplexFeature::IsAvailableToManifest(
|
| const std::string& extension_id,
|
| + const std::string& hashed_id,
|
| Manifest::Type type,
|
| Manifest::Location location,
|
| int manifest_version,
|
| Platform platform) const {
|
| Feature::Availability first_availability =
|
| - features_[0]->IsAvailableToManifest(
|
| - extension_id, type, location, manifest_version, platform);
|
| + features_[0]->IsAvailableToManifest(extension_id, hashed_id, type,
|
| + location, manifest_version, platform);
|
| if (first_availability.is_available())
|
| return first_availability;
|
|
|
| for (FeatureList::const_iterator it = features_.begin() + 1;
|
| it != features_.end(); ++it) {
|
| Availability availability = (*it)->IsAvailableToManifest(
|
| - extension_id, type, location, manifest_version, platform);
|
| + extension_id, hashed_id, type, location, manifest_version, platform);
|
| if (availability.is_available())
|
| return availability;
|
| }
|
| @@ -76,21 +77,23 @@ Feature::Availability ComplexFeature::IsAvailableToContext(
|
| return first_availability;
|
| }
|
|
|
| -bool ComplexFeature::IsIdInBlacklist(const std::string& extension_id) const {
|
| +bool ComplexFeature::IsIdInBlacklist(const std::string& extension_id,
|
| + const std::string& hashed_id) const {
|
| for (FeatureList::const_iterator it = features_.begin();
|
| it != features_.end();
|
| ++it) {
|
| - if ((*it)->IsIdInBlacklist(extension_id))
|
| + if ((*it)->IsIdInBlacklist(extension_id, hashed_id))
|
| return true;
|
| }
|
| return false;
|
| }
|
|
|
| -bool ComplexFeature::IsIdInWhitelist(const std::string& extension_id) const {
|
| +bool ComplexFeature::IsIdInWhitelist(const std::string& extension_id,
|
| + const std::string& hashed_id) const {
|
| for (FeatureList::const_iterator it = features_.begin();
|
| it != features_.end();
|
| ++it) {
|
| - if ((*it)->IsIdInWhitelist(extension_id))
|
| + if ((*it)->IsIdInWhitelist(extension_id, hashed_id))
|
| return true;
|
| }
|
| return false;
|
|
|