Make Manifest/Permission Features Compose with Feature

chrome/common/extensions/features/manifest_feature.h

Index: chrome/common/extensions/features/manifest_feature.h
diff --git a/chrome/common/extensions/features/manifest_feature.h b/chrome/common/extensions/features/manifest_feature.h
index 4d239694ee50ce24296e3cf3fc3bd2aeb8fed07a..bc4b0bfa5bfaa087345a54eb56cfbd954fed7859 100644
--- a/chrome/common/extensions/features/manifest_feature.h
+++ b/chrome/common/extensions/features/manifest_feature.h
@@ -11,13 +11,16 @@ namespace extensions {
 
 class ManifestFeature : public SimpleFeature {
  public:
-  ManifestFeature();
+  explicit ManifestFeature(Feature* feature);
   virtual ~ManifestFeature();
 
   virtual Feature::Availability IsAvailableToContext(
       const Extension* extension,
       Feature::Context context,
       Feature::Platform platform) const OVERRIDE;
+
+ private:
+  scoped_ptr<Feature> feature_;
 };
 
 }  // extensions