Implement ComplexFeature to support permission features with multiple rules.

chrome/common/extensions/features/simple_feature_provider.h

Index: chrome/common/extensions/features/simple_feature_provider.h
diff --git a/chrome/common/extensions/features/simple_feature_provider.h b/chrome/common/extensions/features/simple_feature_provider.h
index 6da884e256e042694e3ae102c764f42a7464d4e8..54648210dfdc6cd74c184ff97e9a160e41442fe5 100644
--- a/chrome/common/extensions/features/simple_feature_provider.h
+++ b/chrome/common/extensions/features/simple_feature_provider.h
@@ -5,24 +5,25 @@
 #ifndef CHROME_COMMON_EXTENSIONS_FEATURES_SIMPLE_FEATURE_PROVIDER_H_
 #define CHROME_COMMON_EXTENSIONS_FEATURES_SIMPLE_FEATURE_PROVIDER_H_
 
+#include <map>
 #include <set>
 #include <string>
 
 #include "base/memory/linked_ptr.h"
 #include "base/values.h"
-#include "chrome/common/extensions/features/feature.h"
 #include "chrome/common/extensions/features/feature_provider.h"
+#include "chrome/common/extensions/features/simple_feature.h"
 
 namespace extensions {
 
 // Reads Features out of a simple JSON file description.
 class SimpleFeatureProvider : public FeatureProvider {

[not at google - send to devlin, 2012/12/14 19:10:42]

yes please, rename to (Default|Base|Standard)FeatureProvider or something.

[justinlin, 2012/12/14 21:07:52]

OK, next patch :) Probably going with BaseFeatureProvider.

  public:
-  typedef Feature*(*FeatureFactory)();
+  typedef SimpleFeature*(*FeatureFactory)();

[not at google - send to devlin, 2012/12/14 19:10:42]

Feature*(*FeatureFactory) not SimpleFeature*(*FeatureFactory)

[justinlin, 2012/12/14 21:07:52]

Problem with this is that in the .cc file, we'd have to do more casting because
the Parse() methods are on the SimpleFeature class, not Feature.

 
   // Creates a new SimpleFeatureProvider. Pass null to |factory| to have the
   // provider create plain old Feature instances.
-  SimpleFeatureProvider(DictionaryValue* root, FeatureFactory factory);
+  SimpleFeatureProvider(const DictionaryValue& root, FeatureFactory factory);
   virtual ~SimpleFeatureProvider();
 
   // Gets an instance for the _manifest_features.json file that is baked into