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

trunk/src/components/json_schema/json_schema_validator_unittest.cc

 // Copyright 2013 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 "base/values.h"
 #include "components/json_schema/json_schema_validator.h"
 #include "components/json_schema/json_schema_validator_unittest_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class JSONSchemaValidatorCPPTest : public JSONSchemaValidatorTestBase {
@@ skipping 59 matching lines @@
       "  \"properties\": []"  // Invalid properties type.
       "}", &error));
   EXPECT_FALSE(JSONSchemaValidator::IsValidSchema(
       "{"
       "  \"type\": \"string\","
       "  \"maxLength\": -1"  // Must be >= 0.
       "}", &error));
   EXPECT_FALSE(JSONSchemaValidator::IsValidSchema(
       "{"
       "  \"type\": \"string\","
-      "  \"enum\": [ {} ]"  // "enum" dict values must contain "name".
+      "  \"enum\": [ {} ],"  // "enum" must contain simple values.
       "}", &error));
   EXPECT_FALSE(JSONSchemaValidator::IsValidSchema(
       "{"
-      "  \"type\": \"string\","
-      "  \"enum\": [ { \"name\": {} } ]"  // "enum" name must be a simple value.
-      "}",
-      &error));
-  EXPECT_FALSE(JSONSchemaValidator::IsValidSchema(
-      "{"
       "  \"type\": \"array\","
       "  \"items\": [ 123 ],"  // "items" must contain a schema or schemas.
       "}", &error));
   EXPECT_TRUE(JSONSchemaValidator::IsValidSchema(
       "{ \"type\": \"object\" }", &error)) << error;
   EXPECT_TRUE(JSONSchemaValidator::IsValidSchema(
       "{ \"type\": [\"object\", \"array\"] }", &error)) << error;
   EXPECT_TRUE(JSONSchemaValidator::IsValidSchema(
       "{"
       "  \"type\": [\"object\", \"array\"],"
       "  \"properties\": {"
       "    \"string-property\": {"
       "      \"type\": \"string\","
       "      \"minLength\": 1,"
       "      \"maxLength\": 100,"
       "      \"title\": \"The String Policy\","
       "      \"description\": \"This policy controls the String widget.\""
       "    },"
       "    \"integer-property\": {"
       "      \"type\": \"number\","
       "      \"minimum\": 1000.0,"
       "      \"maximum\": 9999.0"
       "    },"
       "    \"enum-property\": {"
       "      \"type\": \"integer\","
-      "      \"enum\": [0, 1, {\"name\": 10}, 100]"
+      "      \"enum\": [0, 1, 10, 100]"
       "    },"
       "    \"items-property\": {"
       "      \"type\": \"array\","
       "      \"items\": {"
       "        \"type\": \"string\""
       "      }"
       "    },"
       "    \"items-list-property\": {"
       "      \"type\": \"array\","
       "      \"items\": ["
       "        { \"type\": \"string\" },"
       "        { \"type\": \"integer\" }"
       "      ]"
       "    }"
       "  },"
       "  \"additionalProperties\": {"
       "    \"type\": \"any\""
       "  }"
       "}", &error)) << error;
 }