Enforce the 'requirements' field in manifests.

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 231445b197bf1bde9d68646ec0520334b59e83d7..eecd52b8f469582985b82a2f6095460f93ddf3a2 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -267,6 +267,14 @@ const int Extension::kValidWebExtentSchemes =
 const int Extension::kValidHostPermissionSchemes =
     UserScript::kValidUserScriptSchemes | URLPattern::SCHEME_CHROMEUI;
 
+Extension::Requirements::Requirements()
+    : webgl(false),
+      css3d(false),
+      plugins(false) {
+}
+
+Extension::Requirements::~Requirements() {}
+
 Extension::InputComponentInfo::InputComponentInfo()
     : type(INPUT_COMPONENT_TYPE_NONE),
       shortcut_alt(false),
@@ -1322,7 +1330,7 @@ bool Extension::LoadSharedFeatures(
       !LoadNaClModules(error) ||
       !LoadWebAccessibleResources(error) ||
       !LoadSandboxedPages(error) ||
-      !CheckRequirements(error) ||
+      !LoadRequirements(error) ||
       !LoadDefaultLocale(error) ||
       !LoadOfflineEnabled(error) ||
       !LoadOptionsPage(error) ||
@@ -1694,9 +1702,7 @@ bool Extension::LoadSandboxedPages(string16* error) {
   return true;
 }
 
-// These are not actually persisted (they're only used by the store), but
-// still validated.
-bool Extension::CheckRequirements(string16* error) {
+bool Extension::LoadRequirements(string16* error) {
   if (!manifest_->HasKey(keys::kRequirements))
     return true;
   DictionaryValue* requirements_value = NULL;
@@ -1709,11 +1715,45 @@ bool Extension::CheckRequirements(string16* error) {
        it != requirements_value->end_keys(); ++it) {
     DictionaryValue* requirement_value;
     if (!requirements_value->GetDictionaryWithoutPathExpansion(
-        *it, &requirement_value)) {
+        *it,
+        &requirement_value)) {

[Aaron Boodman, 2012/08/06 20:36:07]

nit: previous indentation style was fine.

[eaugusti, 2012/08/17 23:25:01]

Done.

       *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidRequirement, *it);
       return false;
     }
+
+    if (*it == "plugins") {
+      requirements_.plugins = true;
+    } else if (*it == "3D") {
+      ListValue* features;

[Aaron Boodman, 2012/08/06 20:36:07]

= NULL;

[eaugusti, 2012/08/17 23:25:01]

Done.

+      if (!requirement_value->GetListWithoutPathExpansion("features",
+                                                          &features) ||
+          !features) {
+        *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+            errors::kInvalidRequirement, *it);
+        return false;
+      }
+
+      for (base::ListValue::iterator feature_it = features->begin();
+           feature_it != features->end();
+           ++feature_it) {
+        std::string feature;
+        if ((*feature_it)->GetAsString(&feature)) {
+          if (feature == "webgl") {
+            requirements_.webgl = true;
+          } else if (feature == "css3d") {
+            requirements_.css3d = true;
+          } else {
+            *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
+                errors::kInvalidRequirement, *it);
+            return false;
+          }
+        }
+      }
+    } else {
+      *error = ASCIIToUTF16(errors::kInvalidRequirements);
+      return false;
+    }
   }
   return true;
 }