Allow features to refer to subkeys in _manifest_features.json.

chrome/common/extensions/manifest.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/manifest.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_split.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/simple_feature_provider.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 Manifest::Manifest(Extension::Location location,
                    scoped_ptr<DictionaryValue> value)
     : location_(location), value_(value.Pass()) {
 }
 
 Manifest::~Manifest() {
 }
 
 bool Manifest::ValidateManifest(string16* error) const {
-  for (DictionaryValue::key_iterator key = value_->begin_keys();
-       key != value_->end_keys(); ++key) {
+  // Check every feature to see if its in the manifest. Note that this means
+  // we will ignore keys that are not features; we do this for forward
+  // compatibility.
+  // TODO(aa): Consider having an error here in the case of strict error
+  // checking to let developers know when they screw up.
+
+  std::set<std::string> feature_names =
+      SimpleFeatureProvider::GetManifestFeatures()->GetAllFeatureNames();
+  for (std::set<std::string>::iterator feature_name = feature_names.begin();
+       feature_name != feature_names.end(); ++feature_name) {
+    // Use Get instead of HasKey because the former uses path expansion.
+    if (!value_->Get(*feature_name, NULL))
+      continue;
+
     Feature* feature =
-        SimpleFeatureProvider::GetManifestFeatures()->GetFeature(*key);
-    if (!feature) {
-      // When validating the extension manifests, we ignore keys that are not
-      // recognized for forward compatibility.
-      // TODO(aa): Consider having an error here in the case of strict error
-      // checking to let developers know when they screw up.
-      continue;
-    }
-
+        SimpleFeatureProvider::GetManifestFeatures()->GetFeature(*feature_name);
     Feature::Availability result = feature->IsAvailableToManifest(
         extension_id_, GetType(), Feature::ConvertLocation(location_),
         GetManifestVersion());
     if (result != Feature::IS_AVAILABLE) {
-      *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
-          errors::kFeatureNotAllowed,
-          *key,
-          feature->GetErrorMessage(result));
+      *error = UTF8ToUTF16(feature->GetErrorMessage(result));
       return false;
     }
   }
 
   return true;
 }
 
 bool Manifest::HasKey(const std::string& key) const {
   return CanAccessKey(key) && value_->HasKey(key);
 }
@@ skipping 80 matching lines @@
   return GetType() == Extension::TYPE_PACKAGED_APP;
 }
 
 bool Manifest::IsHostedApp() const {
   return GetType() == Extension::TYPE_HOSTED_APP;
 }
 
 bool Manifest::CanAccessPath(const std::string& path) const {
   std::vector<std::string> components;
   base::SplitString(path, '.', &components);
-  return CanAccessKey(components[0]);
+  std::string key;
+  for (size_t i = 0; i < components.size(); ++i) {
+    key += components[i];
+    if (!CanAccessKey(key))
+      return false;
+    key += '.';
+  }
+  return true;
 }
 
 bool Manifest::CanAccessKey(const std::string& key) const {
   Feature* feature =
       SimpleFeatureProvider::GetManifestFeatures()->GetFeature(key);
   if (!feature)
-    return false;
+    return true;
 
   return Feature::IS_AVAILABLE == feature->IsAvailableToManifest(
       extension_id_, GetType(), Feature::ConvertLocation(location_),
       GetManifestVersion());
 }
 
 }  // namespace extensions