Allow features to refer to subkeys in _manifest_features.json.

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 "base/base64.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 457 matching lines @@
                                            int flags,
                                            const std::string& explicit_id,
                                            std::string* utf8_error) {
   DCHECK(utf8_error);
   string16 error;
   scoped_ptr<extensions::Manifest> manifest(
       new extensions::Manifest(
           location,
           scoped_ptr<DictionaryValue>(value.DeepCopy())));
 
-  if (!InitExtensionID(manifest.get(), path, explicit_id, flags, &error) ||
-      !manifest->ValidateManifest(&error)) {
+  if (!InitExtensionID(manifest.get(), path, explicit_id, flags, &error)) {
     *utf8_error = UTF16ToUTF8(error);
     return NULL;
   }
 
+  std::vector<std::string> install_warnings;
+  manifest->ValidateManifest(&install_warnings);
+
   scoped_refptr<Extension> extension = new Extension(path, manifest.Pass());
+  extension->install_warnings_.swap(install_warnings);
+
   if (!extension->InitFromValue(flags, &error)) {
     *utf8_error = UTF16ToUTF8(error);
     return NULL;
   }
 
   if (extension->is_platform_app()) {
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnablePlatformApps)) {
       *utf8_error = errors::kPlatformAppFlagRequired;
       return NULL;
@@ skipping 1376 matching lines @@
     background_url_ = GetResourceURL(background_str);
   }
 
   return true;
 }
 
 bool Extension::LoadBackgroundPersistent(
     const ExtensionAPIPermissionSet& api_permissions,
     string16* error) {
   Value* background_persistent = NULL;
-  if (!api_permissions.count(ExtensionAPIPermission::kExperimental) ||
-      !manifest_->Get(keys::kBackgroundPersistent, &background_persistent))
+  if (!manifest_->Get(keys::kBackgroundPersistent, &background_persistent))
     return true;
 
-  if (!background_persistent->IsType(Value::TYPE_BOOLEAN) ||
-      !background_persistent->GetAsBoolean(&background_page_is_persistent_)) {
+  if (!background_persistent->GetAsBoolean(&background_page_is_persistent_)) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistent);
     return false;
   }
 
   if (!has_background_page()) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage);
     return false;
   }
 
   return true;
@@ skipping 1772 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}