Remove FundamentalValue

tools/json_schema_compiler/test/choices_unittest.cc

 // Copyright (c) 2012 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 "tools/json_schema_compiler/test/choices.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/strings/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/json_schema_compiler/test/test_util.h"
 
 namespace {
 
 using namespace test::api::choices;
 using json_schema_compiler::test_util::Dictionary;
 using json_schema_compiler::test_util::List;
 using json_schema_compiler::test_util::ReadJson;
 using json_schema_compiler::test_util::Vector;
 
 TEST(JsonSchemaCompilerChoicesTest, TakesIntegersParamsCreate) {
   {
     std::unique_ptr<TakesIntegers::Params> params(
-        TakesIntegers::Params::Create(*List(new base::FundamentalValue(true))));
+        TakesIntegers::Params::Create(*List(new base::Value(true))));
     EXPECT_FALSE(params);
   }
   {
     std::unique_ptr<TakesIntegers::Params> params(
-        TakesIntegers::Params::Create(*List(new base::FundamentalValue(6))));
+        TakesIntegers::Params::Create(*List(new base::Value(6))));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->nums.as_integers);
     EXPECT_EQ(6, *params->nums.as_integer);
   }
   {
     std::unique_ptr<TakesIntegers::Params> params(TakesIntegers::Params::Create(
-        *List(List(new base::FundamentalValue(2), new base::FundamentalValue(6),
-                   new base::FundamentalValue(8))
+        *List(List(new base::Value(2), new base::Value(6),
+                   new base::Value(8))
                   .release())));
     ASSERT_TRUE(params);
     ASSERT_TRUE(params->nums.as_integers);
     EXPECT_EQ(Vector(2, 6, 8), *params->nums.as_integers);
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*List(
             Dictionary("strings", new base::StringValue("asdf")).release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
     EXPECT_EQ("asdf", *params->string_info.strings.as_string);
     EXPECT_FALSE(params->string_info.integers);
   }
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(
             *List(Dictionary("strings", new base::StringValue("asdf"),
-                             "integers", new base::FundamentalValue(6))
+                             "integers", new base::Value(6))
                       .release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
     EXPECT_EQ("asdf", *params->string_info.strings.as_string);
     ASSERT_TRUE(params->string_info.integers);
     EXPECT_FALSE(params->string_info.integers->as_integers);
     EXPECT_EQ(6, *params->string_info.integers->as_integer);
   }
 }
 
 // TODO(kalman): Clean up the rest of these tests to use the
 // Vector/List/Dictionary helpers.
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings",
-                                          new base::FundamentalValue(5));
+                                          new base::Value(5));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings",
                                           new base::StringValue("asdf"));
     object_param->SetWithoutPathExpansion("integers",
                                           new base::StringValue("asdf"));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("integers",
-                                          new base::FundamentalValue(6));
+                                          new base::Value(6));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, PopulateChoiceType) {
   std::vector<std::string> strings = Vector(std::string("list"),
@@ skipping 49 matching lines @@
 
     EXPECT_TRUE(expected.Equals(results_value.get()));
   }
   {
     ReturnChoices::Results::Result results;
     results.as_integer.reset(new int(5));
 
     std::unique_ptr<base::Value> results_value = results.ToValue();
     ASSERT_TRUE(results_value);
 
-    base::FundamentalValue expected(5);
+    base::Value expected(5);
 
     EXPECT_TRUE(expected.Equals(results_value.get()));
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, NestedChoices) {
   // These test both ToValue and FromValue for every legitimate configuration of
   // NestedChoices.
   {
     // The plain integer choice.
@@ skipping 106 matching lines @@
           obj->as_choice2->as_choice_types.get();
       // Bleh too much effort to test everything.
       ASSERT_EQ(2u, choice_types->size());
     }
 
     EXPECT_TRUE(base::Value::Equals(value.get(), obj->ToValue().get()));
   }
 }
 
 }  // namespace