Implement ComplexFeature to support permission features with multiple rules.

chrome/common/extensions/api/extension_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/api/extension_api.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 268 matching lines @@
     }
 
     // Populate feature maps.
     // TODO(aa): Consider not storing features that can never run on the current
     // machine (e.g., because of platform restrictions).
     bool uses_feature_system = false;
     schema->GetBoolean("uses_feature_system", &uses_feature_system);
     if (!uses_feature_system)
       continue;
 
-    Feature* feature = new Feature();
+    SimpleFeature* feature = new SimpleFeature();

[not at google - send to devlin, 2012/12/12 17:42:41]

s/SimpleFeature/Feature/ in the LHS of expressions in this file

[justinlin, 2012/12/14 12:26:26]

Done, except for this instance in the file. In this case, we're creating a
SimpleFeature explicitly, so we want a SimpleFeature pointer.

     feature->set_name(schema_namespace);
     feature->Parse(schema);
 
     FeatureMap* schema_features = new FeatureMap();
     CHECK(features_.insert(
         std::make_pair(schema_namespace,
                        make_linked_ptr(schema_features))).second);
     CHECK(schema_features->insert(
         std::make_pair("", make_linked_ptr(feature))).second);
 
     for (size_t i = 0; i < arraysize(kChildKinds); ++i) {
       ListValue* child_list = NULL;
       schema->GetList(kChildKinds[i], &child_list);
       if (!child_list)
         continue;
 
       for (size_t j = 0; j < child_list->GetSize(); ++j) {
         DictionaryValue* child = NULL;
         CHECK(child_list->GetDictionary(j, &child));
 
-        scoped_ptr<Feature> child_feature(new Feature(*feature));
+        scoped_ptr<SimpleFeature> child_feature(new SimpleFeature(*feature));
         child_feature->Parse(child);
         if (child_feature->Equals(*feature))
           continue;  // no need to store no-op features
 
         std::string child_name;
         CHECK(child->GetString("name", &child_name));
         child_feature->set_name(schema_namespace + "." + child_name);
         CHECK(schema_features->insert(
             std::make_pair(child_name,
                            make_linked_ptr(child_feature.release()))).second);
@@ skipping 197 matching lines @@
   // First try to use the feature system.
   Feature* feature(GetFeature(full_name));
   if (feature) {
     // An API is 'privileged' if it or any of its dependencies can only be run
     // in a blessed context.
     std::set<std::string> resolved_dependencies;
     resolved_dependencies.insert(full_name);
     ResolveDependencies(&resolved_dependencies);
     for (std::set<std::string>::iterator iter = resolved_dependencies.begin();
          iter != resolved_dependencies.end(); ++iter) {
-      Feature* dependency = GetFeatureDependency(*iter);
+      SimpleFeature* dependency =
+          static_cast<SimpleFeature*>(GetFeatureDependency(*iter));
       for (std::set<Feature::Context>::iterator context =
                dependency->contexts()->begin();
            context != dependency->contexts()->end(); ++context) {
         if (*context != Feature::BLESSED_EXTENSION_CONTEXT)
           return false;
       }
     }
     return true;
   }
 
@@ skipping 149 matching lines @@
     std::string feature_type;
     std::string feature_name;
     SplitDependencyName(*iter, &feature_type, &feature_name);
     if (feature_type == "api")
       result->insert(feature_name);
   }
 
   return result.Pass();
 }
 
-Feature* ExtensionAPI::GetFeature(const std::string& full_name) {
+SimpleFeature* ExtensionAPI::GetFeature(const std::string& full_name) {
   // Ensure it's loaded.
   GetSchema(full_name);
 
   std::string child_name;
   std::string api_namespace = GetAPINameFromFullName(full_name, &child_name);
 
   APIFeatureMap::iterator feature_map = features_.find(api_namespace);
   if (feature_map == features_.end())
     return NULL;
 
-  Feature* result = NULL;
+  SimpleFeature* result = NULL;
   FeatureMap::iterator child_feature = feature_map->second->find(child_name);
   if (child_feature != feature_map->second->end()) {
     result = child_feature->second.get();
   } else {
     FeatureMap::iterator parent_feature = feature_map->second->find("");
     CHECK(parent_feature != feature_map->second->end());
     result = parent_feature->second.get();
   }
 
   if (result->contexts()->empty()) {
     LOG(ERROR) << "API feature '" << full_name
                << "' must specify at least one context.";
     return NULL;
   }
 
   return result;
 }
 
-Feature* ExtensionAPI::GetFeatureDependency(const std::string& full_name) {
+Feature* ExtensionAPI::GetFeatureDependency(
+    const std::string& full_name) {
   std::string feature_type;
   std::string feature_name;
   SplitDependencyName(full_name, &feature_type, &feature_name);
 
   FeatureProviderMap::iterator provider =
       dependency_providers_.find(feature_type);
   CHECK(provider != dependency_providers_.end()) << full_name;
 
   Feature* feature = provider->second->GetFeature(feature_name);
   CHECK(feature) << full_name;
@@ skipping 119 matching lines @@
 
 void ExtensionAPI::LoadAllSchemas() {
   while (unloaded_schemas_.size()) {
     std::map<std::string, base::StringPiece>::iterator it =
         unloaded_schemas_.begin();
     LoadSchema(it->first, it->second);
   }
 }
 
 }  // namespace extensions