Remove base::FundamentalValue

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 126 matching lines @@
           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(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
-      schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(false)).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(),
       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::FundamentalValue(42)).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(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidChoice);
   ExpectNotValid(
@@ skipping 213 matching lines @@
                  NULL,
                  std::string(),
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kArrayMaxItems, "2"));
 
   instance->Remove(1, NULL);
   instance->Remove(1, NULL);
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "1",
                  JSONSchemaValidator::kArrayItemRequired);
 
-  instance->Set(0, new base::FundamentalValue(42));
+  instance->Set(0, new base::Value(42));
   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->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,
                      schema::kArray));
-  instance->Set(2, new base::FundamentalValue(false));
+  instance->Set(2, new base::Value(false));
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   base::ListValue* items_schema = NULL;
   base::DictionaryValue* item0_schema = NULL;
   ASSERT_TRUE(schema->GetList(schema::kItems, &items_schema));
   ASSERT_TRUE(items_schema->GetDictionary(0, &item0_schema));
   item0_schema->SetBoolean(schema::kOptional, true);
   instance->Remove(2, NULL);
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   // TODO(aa): I think this is inconsistent with the handling of NULL+optional
   // for objects.
   instance->Set(0, base::Value::CreateNullValue());
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
-  instance->Set(0, new base::FundamentalValue(42));
+  instance->Set(0, new base::Value(42));
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType,
                      schema::kString,
                      schema::kInteger));
 }
 
 void JSONSchemaValidatorTestBase::TestArrayNonTuple() {
   std::unique_ptr<base::DictionaryValue> schema(new base::DictionaryValue());
   schema->SetString(schema::kType, schema::kArray);
@@ skipping 66 matching lines @@
 }
 
 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);
   schema->SetInteger("maxDecimal", 2);
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::FundamentalValue(1)).get(),
+              std::unique_ptr<base::Value>(new base::Value(1)).get(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(50)).get(),
-      schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(100)).get(),
-      schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(88.88)).get(),
-      schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value(50)).get(),
+              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value(100)).get(),
+              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value(88.88)).get(),
+              schema.get(), NULL);
 
-  ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(0.5)).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(
-          JSONSchemaValidator::kNumberMinimum, "1"));
-  ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(100.1)).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(
-          JSONSchemaValidator::kNumberMaximum, "100"));
+  ExpectNotValid(TEST_SOURCE,
+                 std::unique_ptr<base::Value>(new base::Value(0.5)).get(),
+                 schema.get(), NULL, std::string(),
+                 JSONSchemaValidator::FormatErrorMessage(
+                     JSONSchemaValidator::kNumberMinimum, "1"));
+  ExpectNotValid(TEST_SOURCE,
+                 std::unique_ptr<base::Value>(new base::Value(100.1)).get(),
+                 schema.get(), NULL, std::string(),
+                 JSONSchemaValidator::FormatErrorMessage(
+                     JSONSchemaValidator::kNumberMaximum, "100"));
 }
 
 void JSONSchemaValidatorTestBase::TestTypeClassifier() {
   EXPECT_EQ(std::string(schema::kBoolean),
             JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(new base::FundamentalValue(true))
-                    .get()));
+                std::unique_ptr<base::Value>(new base::Value(true)).get()));
   EXPECT_EQ(std::string(schema::kBoolean),
             JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(new base::FundamentalValue(false))
-                    .get()));
+                std::unique_ptr<base::Value>(new base::Value(false)).get()));
 
   // It doesn't matter whether the C++ type is 'integer' or 'real'. If the
   // number is integral and within the representable range of integers in
   // double, it's classified as 'integer'.
+  EXPECT_EQ(std::string(schema::kInteger),
+            JSONSchemaValidator::GetJSONSchemaType(
+                std::unique_ptr<base::Value>(new base::Value(42)).get()));
+  EXPECT_EQ(std::string(schema::kInteger),
+            JSONSchemaValidator::GetJSONSchemaType(
+                std::unique_ptr<base::Value>(new base::Value(0)).get()));
+  EXPECT_EQ(std::string(schema::kInteger),
+            JSONSchemaValidator::GetJSONSchemaType(
+                std::unique_ptr<base::Value>(new base::Value(42)).get()));
   EXPECT_EQ(
       std::string(schema::kInteger),
       JSONSchemaValidator::GetJSONSchemaType(
-          std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get()));
+          std::unique_ptr<base::Value>(new base::Value(pow(2.0, DBL_MANT_DIG)))
+              .get()));
   EXPECT_EQ(
       std::string(schema::kInteger),
       JSONSchemaValidator::GetJSONSchemaType(
-          std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get()));
-  EXPECT_EQ(
-      std::string(schema::kInteger),
-      JSONSchemaValidator::GetJSONSchemaType(
-          std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get()));
-  EXPECT_EQ(std::string(schema::kInteger),
-            JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(
-                    new base::FundamentalValue(pow(2.0, DBL_MANT_DIG)))
-                    .get()));
-  EXPECT_EQ(std::string(schema::kInteger),
-            JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(
-                    new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG)))
-                    .get()));
+          std::unique_ptr<base::Value>(new base::Value(pow(-2.0, DBL_MANT_DIG)))
+              .get()));
 
   // "number" is only used for non-integral numbers, or numbers beyond what
   // double can accurately represent.
   EXPECT_EQ(std::string(schema::kNumber),
             JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(new base::FundamentalValue(88.8))
+                std::unique_ptr<base::Value>(new base::Value(88.8)).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::kNumber),
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(
-                    new base::FundamentalValue(pow(2.0, DBL_MANT_DIG) * 2))
-                    .get()));
-  EXPECT_EQ(std::string(schema::kNumber),
-            JSONSchemaValidator::GetJSONSchemaType(
-                std::unique_ptr<base::Value>(
-                    new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG) * 2))
+                    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::kArray),
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(new base::ListValue()).get()));
   EXPECT_EQ(
@@ skipping 19 matching lines @@
               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);
 
   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(),
+              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value(0)).get(),
+              schema.get(), NULL);
+
+  schema->SetString(schema::kType, schema::kInteger);
+  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(),
+              schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value(0)).get(),
+              schema.get(), NULL);
   ExpectValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(88.8)).get(),
+      std::unique_ptr<base::Value>(new base::Value(pow(2.0, DBL_MANT_DIG)))
+          .get(),
       schema.get(), NULL);
   ExpectValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+      std::unique_ptr<base::Value>(new base::Value(pow(-2.0, DBL_MANT_DIG)))
+          .get(),
       schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
-      schema.get(), NULL);
+
+  schema->SetString(schema::kType, schema::kBoolean);
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get(),
-              schema.get(), NULL);
-
-  schema->SetString(schema::kType, schema::kInteger);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
-      schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
-      schema.get(), NULL);
-  ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::FundamentalValue(0)).get(),
+              std::unique_ptr<base::Value>(new base::Value(false)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(
-                  new base::FundamentalValue(pow(2.0, DBL_MANT_DIG)))
-                  .get(),
+              std::unique_ptr<base::Value>(new base::Value(true)).get(),
               schema.get(), NULL);
-  ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(
-                  new base::FundamentalValue(pow(-2.0, DBL_MANT_DIG)))
-                  .get(),
-              schema.get(), NULL);
-
-  schema->SetString(schema::kType, schema::kBoolean);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(false)).get(),
-      schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(true)).get(),
-      schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kNull);
   ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
               NULL);
 
   // not valid
   schema->SetString(schema::kType, schema::kObject);
   ExpectNotValid(
       TEST_SOURCE, std::unique_ptr<base::Value>(new base::ListValue()).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
                                               schema::kObject, schema::kArray));
 
   schema->SetString(schema::kType, schema::kObject);
   ExpectNotValid(
       TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(), NULL,
       std::string(),
       JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
                                               schema::kObject, schema::kNull));
 
   schema->SetString(schema::kType, schema::kArray);
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value(42)).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kArray, schema::kInteger));
 
   schema->SetString(schema::kType, schema::kString);
-  ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::FundamentalValue(42)).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
-                                              schema::kString,
-                                              schema::kInteger));
+  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(),
       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::FundamentalValue(88.8)).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::kInvalidTypeIntegerNumber);
+  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::FundamentalValue(1)).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
-                                              schema::kBoolean,
-                                              schema::kInteger));
+  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::FundamentalValue(false)).get(),
+      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));
 }