base: Add three helper functions to Values API.

chrome/common/json_schema_validator_unittest_base.cc

Index: chrome/common/json_schema_validator_unittest_base.cc
diff --git a/chrome/common/json_schema_validator_unittest_base.cc b/chrome/common/json_schema_validator_unittest_base.cc
index 5a9112304ffda419f984bb3612a1100709fff461..286c7105848a6d0711b401438829182fde5d74f4 100644
--- a/chrome/common/json_schema_validator_unittest_base.cc
+++ b/chrome/common/json_schema_validator_unittest_base.cc
@@ -139,14 +139,14 @@ void JSONSchemaValidatorTestBase::TestEnum() {
               scoped_ptr<Value>(Value::CreateIntegerValue(42)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
-              scoped_ptr<Value>(Value::CreateBooleanValue(false)).get(),
+              scoped_ptr<Value>(base::FalseValue()).get(),
               schema.get(), NULL);
 
   ExpectNotValid(TEST_SOURCE,
                  scoped_ptr<Value>(Value::CreateStringValue("42")).get(),
                  schema.get(), NULL, "", JSONSchemaValidator::kInvalidEnum);
   ExpectNotValid(TEST_SOURCE,
-                 scoped_ptr<Value>(Value::CreateNullValue()).get(),
+                 scoped_ptr<Value>(base::NullValue()).get(),
                  schema.get(), NULL, "", JSONSchemaValidator::kInvalidEnum);
 }
 
@@ -154,7 +154,7 @@ void JSONSchemaValidatorTestBase::TestChoices() {
   scoped_ptr<DictionaryValue> schema(LoadDictionary("choices_schema.json"));
 
   ExpectValid(TEST_SOURCE,
-              scoped_ptr<Value>(Value::CreateNullValue()).get(),
+              scoped_ptr<Value>(base::NullValue()).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               scoped_ptr<Value>(Value::CreateIntegerValue(42)).get(),
@@ -236,7 +236,7 @@ void JSONSchemaValidatorTestBase::TestObject() {
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   instance->Remove("bar", NULL);
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
-  instance->Set("bar", Value::CreateNullValue());
+  instance->Set("bar", base::NullValue());
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL,
                  "bar", JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, "integer", "null"));
@@ -344,7 +344,7 @@ void JSONSchemaValidatorTestBase::TestArrayTuple() {
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "2",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, "boolean", "array"));
-  instance->Set(2, Value::CreateBooleanValue(false));
+  instance->Set(2, base::FalseValue());
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   ListValue* items_schema = NULL;
@@ -356,7 +356,7 @@ void JSONSchemaValidatorTestBase::TestArrayTuple() {
   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, Value::CreateNullValue());
+  instance->Set(0, base::NullValue());
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   instance->Set(0, Value::CreateIntegerValue(42));
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
@@ -460,9 +460,9 @@ void JSONSchemaValidatorTestBase::TestNumber() {
 
 void JSONSchemaValidatorTestBase::TestTypeClassifier() {
   EXPECT_EQ("boolean", JSONSchemaValidator::GetJSONSchemaType(
-      scoped_ptr<Value>(Value::CreateBooleanValue(true)).get()));
+      scoped_ptr<Value>(base::TrueValue()).get()));
   EXPECT_EQ("boolean", JSONSchemaValidator::GetJSONSchemaType(
-      scoped_ptr<Value>(Value::CreateBooleanValue(false)).get()));
+      scoped_ptr<Value>(base::FalseValue()).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
@@ -498,7 +498,7 @@ void JSONSchemaValidatorTestBase::TestTypeClassifier() {
   EXPECT_EQ("object", JSONSchemaValidator::GetJSONSchemaType(
       scoped_ptr<Value>(new DictionaryValue()).get()));
   EXPECT_EQ("null", JSONSchemaValidator::GetJSONSchemaType(
-      scoped_ptr<Value>(Value::CreateNullValue()).get()));
+      scoped_ptr<Value>(base::NullValue()).get()));
 }
 
 void JSONSchemaValidatorTestBase::TestTypes() {
@@ -553,15 +553,15 @@ void JSONSchemaValidatorTestBase::TestTypes() {
 
   schema->SetString("type", "boolean");
   ExpectValid(TEST_SOURCE,
-              scoped_ptr<Value>(Value::CreateBooleanValue(false)).get(),
+              scoped_ptr<Value>(base::FalseValue()).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
-              scoped_ptr<Value>(Value::CreateBooleanValue(true)).get(),
+              scoped_ptr<Value>(base::TrueValue()).get(),
               schema.get(), NULL);
 
   schema->SetString("type", "null");
   ExpectValid(TEST_SOURCE,
-              scoped_ptr<Value>(Value::CreateNullValue()).get(),
+              scoped_ptr<Value>(base::NullValue()).get(),
               schema.get(), NULL);
 
   // not valid
@@ -572,7 +572,7 @@ void JSONSchemaValidatorTestBase::TestTypes() {
                      JSONSchemaValidator::kInvalidType, "object", "array"));
 
   schema->SetString("type", "object");
-  ExpectNotValid(TEST_SOURCE, scoped_ptr<Value>(Value::CreateNullValue()).get(),
+  ExpectNotValid(TEST_SOURCE, scoped_ptr<Value>(base::NullValue()).get(),
                  schema.get(), NULL, "",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, "object", "null"));
@@ -621,7 +621,7 @@ void JSONSchemaValidatorTestBase::TestTypes() {
 
   schema->SetString("type", "null");
   ExpectNotValid(TEST_SOURCE,
-                 scoped_ptr<Value>(Value::CreateBooleanValue(false)).get(),
+                 scoped_ptr<Value>(base::FalseValue()).get(),
                  schema.get(), NULL, "",
                  JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType, "null", "boolean"));