Enforce the 'requirements' field in manifests.

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 20 matching lines @@
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/extension_switch_utils.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/permissions_info.h"
+#include "chrome/common/extensions/requirements_provider.h"
 #include "chrome/common/extensions/url_pattern_set.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/url_constants.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/url_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 1618 matching lines @@
   } else {
     sandboxed_pages_content_security_policy_ =
         kDefaultSandboxedPageContentSecurityPolicy;
     CHECK(ContentSecurityPolicyIsSandboxed(
         sandboxed_pages_content_security_policy_, GetType()));
   }
 
   return true;
 }
 
-// These are not actually persisted (they're only used by the store), but
-// still validated.
 bool Extension::CheckRequirements(string16* error) {
-  if (!manifest_->HasKey(keys::kRequirements))
+  if (!manifest_->HasKey(keys::kRequirements)) {

[Aaron Boodman, 2012/07/16 21:16:12]

No need for braces here.

     return true;
+  }
+
   DictionaryValue* requirements_value = NULL;
   if (!manifest_->GetDictionary(keys::kRequirements, &requirements_value)) {
     *error = ASCIIToUTF16(errors::kInvalidRequirements);
     return false;
   }
 
   for (DictionaryValue::key_iterator it = requirements_value->begin_keys();
        it != requirements_value->end_keys(); ++it) {
     DictionaryValue* requirement_value;
     if (!requirements_value->GetDictionaryWithoutPathExpansion(
         *it, &requirement_value)) {
       *error = ExtensionErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidRequirement, *it);
       return false;
     }
   }
+
   return true;
 }
 
 bool Extension::LoadDefaultLocale(string16* error) {
   if (!manifest_->HasKey(keys::kDefaultLocale))
     return true;
   if (!manifest_->GetString(keys::kDefaultLocale, &default_locale_) ||
       !l10n_util::IsValidLocaleSyntax(default_locale_)) {
     *error = ASCIIToUTF16(errors::kInvalidDefaultLocale);
     return false;
@@ skipping 2168 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions