Allow features to refer to subkeys in _manifest_features.json.

chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.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_tests/extension_manifest_test.h"
 
 #include "base/values.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/simple_feature_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 
+namespace extensions {
+
 TEST_F(ExtensionManifestTest, BackgroundPermission) {
   LoadAndExpectError("background_permission.json",
                      errors::kBackgroundPermissionNeeded);
 
   scoped_refptr<Extension> extension;
   extension = LoadAndExpectSuccess("background_permission_alias.json");
   EXPECT_TRUE(extension->HasAPIPermission(ExtensionAPIPermission::kBackground));
 }
 
 TEST_F(ExtensionManifestTest, BackgroundScripts) {
@@ skipping 28 matching lines @@
 
   std::string error;
   scoped_ptr<DictionaryValue> manifest(
       LoadManifestFile("background_page_legacy.json", &error));
   ASSERT_TRUE(manifest.get());
   extension = LoadAndExpectSuccess(Manifest(manifest.get(), ""));
   ASSERT_TRUE(extension);
   EXPECT_EQ("/foo.html", extension->GetBackgroundURL().path());
 
   manifest->SetInteger(keys::kManifestVersion, 2);
+  Feature* feature = SimpleFeatureProvider::GetManifestFeatures()->
+      GetFeature("background_page");
   LoadAndExpectError(
       Manifest(manifest.get(), ""),
-      ExtensionErrorUtils::FormatErrorMessage(
-          errors::kFeatureNotAllowed, "background_page"),
+      feature->GetErrorMessage(Feature::INVALID_MAX_MANIFEST_VERSION),
       Extension::INTERNAL, Extension::STRICT_ERROR_CHECKS);
 }
 
 TEST_F(ExtensionManifestTest, BackgroundAllowNoJsAccess) {
   scoped_refptr<Extension> extension;
   extension = LoadAndExpectSuccess("background_allow_no_js_access.json");
   ASSERT_TRUE(extension);
   EXPECT_FALSE(extension->allow_background_js_access());
 
   extension = LoadAndExpectSuccess("background_allow_no_js_access2.json");
   ASSERT_TRUE(extension);
   EXPECT_FALSE(extension->allow_background_js_access());
 }
+
+}  // namespace extensions