Remove base::Value::CreateNullValue

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 134 matching lines @@
   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::Value("42")).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidEnum);
-  ExpectNotValid(TEST_SOURCE, base::Value::CreateNullValue().get(),
+  ExpectNotValid(TEST_SOURCE, base::MakeUnique<base::Value>().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(),
+  ExpectValid(TEST_SOURCE, base::MakeUnique<base::Value>().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(
@@ skipping 104 matching lines @@
 
   base::DictionaryValue* properties = NULL;
   base::DictionaryValue* bar_property = NULL;
   ASSERT_TRUE(schema->GetDictionary(schema::kProperties, &properties));
   ASSERT_TRUE(properties->GetDictionary("bar", &bar_property));
 
   bar_property->SetBoolean(schema::kOptional, true);
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   instance->Remove("bar", NULL);
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
-  instance->Set("bar", base::Value::CreateNullValue());
+  instance->Set("bar", base::MakeUnique<base::Value>());
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL,
                  "bar", JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType,
                      schema::kInteger,
                      schema::kNull));
   instance->SetString("bar", "42");
   ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL,
                  "bar", JSONSchemaValidator::FormatErrorMessage(
                      JSONSchemaValidator::kInvalidType,
                      schema::kInteger,
@@ skipping 126 matching lines @@
 
   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());
+  instance->Set(0, base::MakeUnique<base::Value>());
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   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() {
@@ skipping 150 matching lines @@
                 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()));
+                base::MakeUnique<base::Value>().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);
@@ skipping 45 matching lines @@
 
   schema->SetString(schema::kType, schema::kBoolean);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(false)).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(true)).get(),
               schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kNull);
-  ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
+  ExpectValid(TEST_SOURCE, base::MakeUnique<base::Value>().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,
+      TEST_SOURCE, base::MakeUnique<base::Value>().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::Value(42)).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kArray, schema::kInteger));
@@ skipping 27 matching lines @@
                      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));
 }