Make Manifest/Permission Features Compose with Feature

chrome/common/extensions/features/permission_feature.cc

Index: chrome/common/extensions/features/permission_feature.cc
diff --git a/chrome/common/extensions/features/permission_feature.cc b/chrome/common/extensions/features/permission_feature.cc
index b6085d22b122464faea00e1cb1715286d29ee01e..bfe53219ad1b8d94f3ec30903f27f6027575f060 100644
--- a/chrome/common/extensions/features/permission_feature.cc
+++ b/chrome/common/extensions/features/permission_feature.cc
@@ -6,7 +6,8 @@
 
 namespace extensions {
 
-PermissionFeature::PermissionFeature() {
+PermissionFeature::PermissionFeature(Feature* feature)
+    : feature_(feature) {
 }
 
 PermissionFeature::~PermissionFeature() {
@@ -16,9 +17,9 @@ Feature::Availability PermissionFeature::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;