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

chrome/common/extensions/manifest_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.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 54 matching lines @@
 
   // Set the manifest_version to 2; background_page should stop working.
   value.clear();
   manifest->value()->SetInteger(keys::kManifestVersion, 2);
   EXPECT_FALSE(manifest->GetString("background_page", &value));
   EXPECT_EQ("", value);
 
   // 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());
   EXPECT_TRUE(manifest->Equals(manifest2.get()));
   EXPECT_TRUE(manifest2->Equals(manifest.get()));
   manifest->value()->Set("foo", Value::CreateStringValue("blah"));
   EXPECT_FALSE(manifest->Equals(manifest2.get()));
 }
 
 // Verifies that key restriction based on type works.
@@ skipping 93 matching lines @@
   ListValue* expected_list = new ListValue();
   ListValue* actual_list = NULL;
   expected_list->Append(Value::CreateStringValue("blah"));
   manifest->value()->Set(unknown_key, expected_list);
   EXPECT_FALSE(manifest->GetList(unknown_key, &actual_list));
   EXPECT_EQ(NULL, actual_list);
   EXPECT_TRUE(manifest->value()->Remove(unknown_key, NULL));
 }
 
 }  // namespace extensions