Remove base::StringValue

components/json_schema/json_schema_validator_unittest_base.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 "components/json_schema/json_schema_validator_unittest_base.h"
 
 #include <cfloat>
 #include <cmath>
 #include <limits>
 #include <memory>
@@ skipping 105 matching lines @@
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kStringMaxLength, "10"));
 }
 
 void JSONSchemaValidatorTestBase::TestStringPattern() {
   std::unique_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
   schema->SetString(schema::kType, schema::kString);
   schema->SetString(schema::kPattern, "foo+");
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+              std::unique_ptr<base::Value>(new base::Value("foo")).get(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foooooo")).get(),
-      schema.get(), NULL);
-  ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("bar")).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(
-          JSONSchemaValidator::kStringPattern, "foo+"));
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("foooooo")).get(),
+              schema.get(), NULL);
+  ExpectNotValid(TEST_SOURCE,
+                 std::unique_ptr<base::Value>(new base::Value("bar")).get(),
+                 schema.get(), NULL, std::string(),
+                 JSONSchemaValidator::FormatErrorMessage(
+                     JSONSchemaValidator::kStringPattern, "foo+"));
 }
 
 void JSONSchemaValidatorTestBase::TestEnum() {
   std::unique_ptr<base::DictionaryValue> schema(
       LoadDictionary("enum_schema.json"));
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+              std::unique_ptr<base::Value>(new base::Value("foo")).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(42)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(false)).get(),
               schema.get(), NULL);
 
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("42")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("42")).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidEnum);
   ExpectNotValid(TEST_SOURCE, base::Value::CreateNullValue().get(),
                  schema.get(), NULL, std::string(),
                  JSONSchemaValidator::kInvalidEnum);
 }
 
 void JSONSchemaValidatorTestBase::TestChoices() {
   std::unique_ptr<base::DictionaryValue> schema(
       LoadDictionary("choices_schema.json"));
 
   ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
               NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(42)).get(),
               schema.get(), NULL);
 
   std::unique_ptr<base::DictionaryValue> instance(new base::DictionaryValue());
   instance->SetString("foo", "bar");
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("foo")).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidChoice);
   ExpectNotValid(
       TEST_SOURCE, std::unique_ptr<base::Value>(new base::ListValue()).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidChoice);
 
   instance->SetInteger("foo", 42);
   ExpectNotValid(TEST_SOURCE,
                  instance.get(),
                  schema.get(),
                  NULL,
@@ skipping 216 matching lines @@
   instance->AppendInteger(42);
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType,
                      schema::kString,
                      schema::kInteger));
 
   base::DictionaryValue* additional_properties = new base::DictionaryValue();
   additional_properties->SetString(schema::kType, schema::kAny);
   schema->Set(schema::kAdditionalProperties, additional_properties);
-  instance->Set(0, new base::StringValue("42"));
+  instance->Set(0, new base::Value("42"));
   instance->AppendString("anything");
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   instance->Set(2, new base::ListValue());
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   additional_properties->SetString(schema::kType, schema::kBoolean);
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "2",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType,
                      schema::kBoolean,
@@ skipping 63 matching lines @@
                      schema::kInteger));
 }
 
 void JSONSchemaValidatorTestBase::TestString() {
   std::unique_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
   schema->SetString(schema::kType, schema::kString);
   schema->SetInteger(schema::kMinLength, 1);
   schema->SetInteger(schema::kMaxLength, 10);
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("x")).get(),
+              std::unique_ptr<base::Value>(new base::Value("x")).get(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("xxxxxxxxxx")).get(),
-      schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("xxxxxxxxxx")).get(),
+              schema.get(), NULL);
 
   ExpectNotValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue(std::string())).get(),
+      std::unique_ptr<base::Value>(new base::Value(std::string())).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kStringMinLength, "1"));
   ExpectNotValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("xxxxxxxxxxx")).get(),
+      std::unique_ptr<base::Value>(new base::Value("xxxxxxxxxxx")).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kStringMaxLength, "10"));
 }
 
 void JSONSchemaValidatorTestBase::TestNumber() {
   std::unique_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
   schema->SetString(schema::kType, schema::kNumber);
   schema->SetInteger(schema::kMinimum, 1);
   schema->SetInteger(schema::kMaximum, 100);
@@ skipping 64 matching lines @@
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(
                     new base::Value(pow(2.0, DBL_MANT_DIG) * 2))
                     .get()));
   EXPECT_EQ(std::string(schema::kNumber),
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(
                     new base::Value(pow(-2.0, DBL_MANT_DIG) * 2))
                     .get()));
 
-  EXPECT_EQ(
-      std::string(schema::kString),
-      JSONSchemaValidator::GetJSONSchemaType(
-          std::unique_ptr<base::Value>(new base::StringValue("foo")).get()));
+  EXPECT_EQ(std::string(schema::kString),
+            JSONSchemaValidator::GetJSONSchemaType(
+                std::unique_ptr<base::Value>(new base::Value("foo")).get()));
   EXPECT_EQ(std::string(schema::kArray),
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(new base::ListValue()).get()));
   EXPECT_EQ(
       std::string(schema::kObject),
       JSONSchemaValidator::GetJSONSchemaType(
           std::unique_ptr<base::Value>(new base::DictionaryValue()).get()));
   EXPECT_EQ(std::string(schema::kNull),
             JSONSchemaValidator::GetJSONSchemaType(
                 base::Value::CreateNullValue().get()));
 }
 
 void JSONSchemaValidatorTestBase::TestTypes() {
   std::unique_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
 
   // valid
   schema->SetString(schema::kType, schema::kObject);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::DictionaryValue()).get(),
               schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kArray);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::ListValue()).get(),
               schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kString);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foobar")).get(),
-      schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("foobar")).get(),
+              schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kNumber);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(88.8)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(42)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(42)).get(),
@@ skipping 60 matching lines @@
   schema->SetString(schema::kType, schema::kString);
   ExpectNotValid(TEST_SOURCE,
                  std::unique_ptr<base::Value>(new base::Value(42)).get(),
                  schema.get(), NULL, std::string(),
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, schema::kString,
                      schema::kInteger));
 
   schema->SetString(schema::kType, schema::kNumber);
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("42")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("42")).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kNumber, schema::kString));
 
   schema->SetString(schema::kType, schema::kInteger);
   ExpectNotValid(TEST_SOURCE,
                  std::unique_ptr<base::Value>(new base::Value(88.8)).get(),
                  schema.get(), NULL, std::string(),
                  JSONSchemaValidator::kInvalidTypeIntegerNumber);
 
   schema->SetString(schema::kType, schema::kBoolean);
   ExpectNotValid(TEST_SOURCE,
                  std::unique_ptr<base::Value>(new base::Value(1)).get(),
                  schema.get(), NULL, std::string(),
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, schema::kBoolean,
                      schema::kInteger));
 
   schema->SetString(schema::kType, schema::kNull);
   ExpectNotValid(
       TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value(false)).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
                                               schema::kNull, schema::kBoolean));
 }