Re-land 125247: Better error messages when using unsupported manifest features.

chrome/common/extensions/manifest_unittest.cc

Index: chrome/common/extensions/manifest_unittest.cc
diff --git a/chrome/common/extensions/manifest_unittest.cc b/chrome/common/extensions/manifest_unittest.cc
index 7ca6ac5153c76deb711e2872082bd29d40be0d18..0d4598297d5fb8ee3c344272093dccea5c6edc0d 100644
--- a/chrome/common/extensions/manifest_unittest.cc
+++ b/chrome/common/extensions/manifest_unittest.cc
@@ -72,8 +72,14 @@ TEST_F(ManifestTest, Extension) {
   // Validate should also stop working.
   error.clear();
   EXPECT_FALSE(manifest->ValidateManifest(&error));
-  EXPECT_EQ(ExtensionErrorUtils::FormatErrorMessageUTF16(
-      errors::kFeatureNotAllowed, "background_page"), error);
+  {
+    Feature feature;
+    feature.set_max_manifest_version(1);
+    EXPECT_EQ(ExtensionErrorUtils::FormatErrorMessageUTF16(
+        errors::kFeatureNotAllowed,
+        "background_page",
+        feature.GetErrorMessage(Feature::INVALID_MAX_MANIFEST_VERSION)), error);
+  }
 
   // Test DeepCopy and Equals.
   scoped_ptr<Manifest> manifest2(manifest->DeepCopy());