Merge 104582 - Add support for an optional "requirements" section in extension/app manifests.

chrome/common/extensions/extension.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1157 matching lines @@
     return true;
 
   for (DictionaryValue::key_iterator key = manifest->begin_keys();
        key != manifest->end_keys(); ++key) {
     if (!IsBaseCrxKey(*key) &&
         *key != keys::kApp &&
         *key != keys::kPermissions &&
         *key != keys::kOptionalPermissions &&
         *key != keys::kOptionsPage &&
         *key != keys::kBackground &&
-        *key != keys::kOfflineEnabled) {
+        *key != keys::kOfflineEnabled &&
+        *key != keys::kMinimumChromeVersion &&
+        *key != keys::kRequirements) {
       *error = ExtensionErrorUtils::FormatErrorMessage(
           errors::kHostedAppsCannotIncludeExtensionFeatures, *key);
       return false;
     }
   }
 
   return true;
 }
 
 // static
@@ skipping 1103 matching lines @@
   }
 
   // Initialize offline-enabled status. Defaults to false.
   if (source.HasKey(keys::kOfflineEnabled)) {
     if (!source.GetBoolean(keys::kOfflineEnabled, &offline_enabled_)) {
       *error = errors::kInvalidOfflineEnabled;
       return false;
     }
   }
 
+  // Initialize requirements (optional). Not actually persisted (they're only
+  // used by the store), but still validated.
+  if (source.HasKey(keys::kRequirements)) {
+    DictionaryValue* requirements_value = NULL;
+    if (!source.GetDictionary(keys::kRequirements, &requirements_value)) {
+      *error = 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::FormatErrorMessage(
+            errors::kInvalidRequirement, *it);
+        return false;
+      }
+    }
+  }
+
   if (HasMultipleUISurfaces()) {
     *error = errors::kOneUISurfaceOnly;
     return false;
   }
 
   runtime_data_.SetActivePermissions(new ExtensionPermissionSet(
       this, api_permissions, host_permissions));
   required_permission_set_ = new ExtensionPermissionSet(
       this, api_permissions, host_permissions);
   optional_permission_set_ = new ExtensionPermissionSet(
@@ skipping 585 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}