Implement ComplexFeature to support permission features with multiple rules.

chrome/common/extensions/extension.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/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 12 matching lines @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/csp_validator.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/extensions/features/complex_feature_provider.h"
 #include "chrome/common/extensions/features/feature.h"
-#include "chrome/common/extensions/features/simple_feature_provider.h"
 #include "chrome/common/extensions/file_browser_handler.h"
 #include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/url_constants.h"
 #include "crypto/sha2.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/url_pattern_set.h"
@@ skipping 683 matching lines @@
     // associated with them are available because the feature system does not
     // know about aliases.
 
     std::vector<std::string> host_data;
     if (!APIPermissionSet::ParseFromJSON(permissions, api_permissions,
                                          error, &host_data))
       return false;
 
     // Verify feature availability of permissions.
     std::vector<APIPermission::ID> to_remove;
-    SimpleFeatureProvider* permission_features =
-        SimpleFeatureProvider::GetPermissionFeatures();
+    ComplexFeatureProvider* permission_features =

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

FeatureProvider on LHS

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

Done.

+        ComplexFeatureProvider::GetPermissionFeatures();
     for (APIPermissionSet::const_iterator it = api_permissions->begin();
          it != api_permissions->end(); ++it) {
       extensions::Feature* feature =
           permission_features->GetFeature(it->name());
 
       // The feature should exist since we just got an APIPermission
       // for it. The two systems should be updated together whenever a
       // permission is added.
       CHECK(feature);
 
@@ skipping 3424 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions