Revert 231982 "Docserver: Display enum value descriptions in API..."

"JsonSchemaTest.TestEnum" started failing on Windows bot after this change.

> Docserver: Display enum value descriptions in API docs.
> 
> This modifies the json schema to allow both primitive types and
> dictionaries with properties "name" and optional "description" for enum
> values.
> 
> BUG=310454
> 
> Review URL: https://codereview.chromium.org/39113003

TBR=sammc@chromium.org

Review URL: https://codereview.chromium.org/47403003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232016 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 7 deletions

diff --git a/chrome/renderer/resources/extensions/json_schema.js b/chrome/renderer/resources/extensions/json_schema.js
index 3c6f394..4b8996a 100644
--- a/chrome/renderer/resources/extensions/json_schema.js
+++ b/chrome/renderer/resources/extensions/json_schema.js
@@ -53,10 +53,6 @@ function isOptionalValue(value) {
   return typeof(value) === 'undefined' || value === null;
 }
 
-function enumToString(enumValue) {
-  return enumValue.name || enumValue;
-}
-
 /**
  * Validates an instance against a schema and accumulates errors. Usage:
  *
@@ -321,12 +317,11 @@ JSONSchemaValidator.prototype.validateChoices =
  */
 JSONSchemaValidator.prototype.validateEnum = function(instance, schema, path) {
   for (var i = 0; i < schema.enum.length; i++) {
-    if (instance === enumToString(schema.enum[i]))
+    if (instance === schema.enum[i])
       return true;
   }
 
-  this.addError(path, "invalidEnum",
-                [schema.enum.map(enumToString).join(", ")]);
+  this.addError(path, "invalidEnum", [schema.enum.join(", ")]);
   return false;
 };