Make Manifest/Permission Features Compose with Feature

chrome/common/extensions/features/manifest_feature.cc

Index: chrome/common/extensions/features/manifest_feature.cc
diff --git a/chrome/common/extensions/features/manifest_feature.cc b/chrome/common/extensions/features/manifest_feature.cc
index 28406d8fecacb2f006413a9d2315e6ea3c61ad7f..d68acb8a6a782c2b17bd20685446b9b0b3b8630c 100644
--- a/chrome/common/extensions/features/manifest_feature.cc
+++ b/chrome/common/extensions/features/manifest_feature.cc
@@ -8,7 +8,8 @@
 
 namespace extensions {
 
-ManifestFeature::ManifestFeature() {
+ManifestFeature::ManifestFeature(Feature* feature)
+    : feature_(feature) {
 }
 
 ManifestFeature::~ManifestFeature() {
@@ -18,9 +19,9 @@ Feature::Availability ManifestFeature::IsAvailableToContext(
     const Extension* extension,
     Feature::Context context,
     Feature::Platform platform) const {
-  Availability availability = SimpleFeature::IsAvailableToContext(extension,
-                                                                  context,
-                                                                  platform);
+  Availability availability = feature_->IsAvailableToContext(extension,
+                                                             context,
+                                                             platform);
   if (!availability.is_available())
     return availability;