Allow features to refer to subkeys in _manifest_features.json.

chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
index 49ccf34f4f14d70eb5f0af343268ef369be0b2b7..535c12750b7aa119d400e4441c4b0548eb36ed5f 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc
@@ -9,10 +9,13 @@
 #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);
@@ -61,10 +64,11 @@ TEST_F(ExtensionManifestTest, BackgroundPage) {
   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);
 }
 
@@ -78,3 +82,5 @@ TEST_F(ExtensionManifestTest, BackgroundAllowNoJsAccess) {
   ASSERT_TRUE(extension);
   EXPECT_FALSE(extension->allow_background_js_access());
 }
+
+}  // namespace extensions