[Extensions] Remove JSONFeatureProvider, SimpleFeature::Parse

extensions/common/features/complex_feature_unittest.cc

Index: extensions/common/features/complex_feature_unittest.cc
diff --git a/extensions/common/features/complex_feature_unittest.cc b/extensions/common/features/complex_feature_unittest.cc
index 426afd70c4b1bd54b54013c19dade2797b5291dd..b1e4ada329f2199284e8d2cde1f659915097b3d6 100644
--- a/extensions/common/features/complex_feature_unittest.cc
+++ b/extensions/common/features/complex_feature_unittest.cc
@@ -19,25 +19,21 @@ TEST(ComplexFeatureTest, MultipleRulesWhitelist) {
   const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
   std::vector<Feature*> features;
 
-  // Rule: "extension", whitelist "foo".
-  std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature);
-  std::unique_ptr<base::DictionaryValue> rule(
-      DictionaryBuilder()
-          .Set("whitelist", ListBuilder().Append(kIdFoo).Build())
-          .Set("extension_types", ListBuilder().Append("extension").Build())
-          .Build());
-  simple_feature->Parse(rule.get());
-  features.push_back(simple_feature.release());
-
-  // Rule: "legacy_packaged_app", whitelist "bar".
-  simple_feature.reset(new SimpleFeature);
-  rule = DictionaryBuilder()
-             .Set("whitelist", ListBuilder().Append(kIdBar).Build())
-             .Set("extension_types",
-                  ListBuilder().Append("legacy_packaged_app").Build())
-             .Build();
-  simple_feature->Parse(rule.get());
-  features.push_back(simple_feature.release());
+  {
+    // Rule: "extension", whitelist "foo".
+    std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature());
+    simple_feature->set_whitelist({kIdFoo.c_str()});
+    simple_feature->set_extension_types({Manifest::TYPE_EXTENSION});
+    features.push_back(simple_feature.release());
+  }
+
+  {
+    // Rule: "legacy_packaged_app", whitelist "bar".
+    std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature());
+    simple_feature->set_whitelist({kIdBar.c_str()});
+    simple_feature->set_extension_types({Manifest::TYPE_LEGACY_PACKAGED_APP});
+    features.push_back(simple_feature.release());
+  }
 
   std::unique_ptr<ComplexFeature> feature(new ComplexFeature(&features));
 
@@ -80,24 +76,20 @@ TEST(ComplexFeatureTest, MultipleRulesWhitelist) {
 TEST(ComplexFeatureTest, Dependencies) {
   std::vector<Feature*> features;
 
-  // Rule which depends on an extension-only feature (content_security_policy).
-  std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature);
-  std::unique_ptr<base::DictionaryValue> rule =
-      DictionaryBuilder()
-          .Set("dependencies",
-               ListBuilder().Append("manifest:content_security_policy").Build())
-          .Build();
-  simple_feature->Parse(rule.get());
-  features.push_back(simple_feature.release());
-
-  // Rule which depends on an platform-app-only feature (serial).
-  simple_feature.reset(new SimpleFeature);
-  rule = DictionaryBuilder()
-             .Set("dependencies",
-                  ListBuilder().Append("permission:serial").Build())
-             .Build();
-  simple_feature->Parse(rule.get());
-  features.push_back(simple_feature.release());
+  {
+    // Rule which depends on an extension-only feature
+    // (content_security_policy).
+    std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature());
+    simple_feature->set_dependencies({"manifest:content_security_policy"});
+    features.push_back(simple_feature.release());
+  }
+
+  {
+    // Rule which depends on an platform-app-only feature (serial).
+    std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature());
+    simple_feature->set_dependencies({"permission:serial"});
+    features.push_back(simple_feature.release());
+  }
 
   std::unique_ptr<ComplexFeature> feature(new ComplexFeature(&features));