Remove more CreateIntegerValue calls.

tools/json_schema_compiler/test/arrays_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/arrays.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/json_schema_compiler/test/enums.h"
 
 using namespace test::api::arrays;
 
 namespace {
 
 // TODO(calamity): Change to AppendString etc once kalman's patch goes through
 static scoped_ptr<base::DictionaryValue> CreateBasicArrayTypeDictionary() {
   base::DictionaryValue* value = new base::DictionaryValue();
   base::ListValue* strings_value = new base::ListValue();
   strings_value->Append(base::Value::CreateStringValue("a"));
   strings_value->Append(base::Value::CreateStringValue("b"));
   strings_value->Append(base::Value::CreateStringValue("c"));
   strings_value->Append(base::Value::CreateStringValue("it's easy as"));
   base::ListValue* integers_value = new base::ListValue();
-  integers_value->Append(base::Value::CreateIntegerValue(1));
-  integers_value->Append(base::Value::CreateIntegerValue(2));
-  integers_value->Append(base::Value::CreateIntegerValue(3));
+  integers_value->Append(new base::FundamentalValue(1));
+  integers_value->Append(new base::FundamentalValue(2));
+  integers_value->Append(new base::FundamentalValue(3));
   base::ListValue* booleans_value = new base::ListValue();
   booleans_value->Append(base::Value::CreateBooleanValue(false));
   booleans_value->Append(base::Value::CreateBooleanValue(true));
   base::ListValue* numbers_value = new base::ListValue();
   numbers_value->Append(base::Value::CreateDoubleValue(6.1));
   value->Set("numbers", numbers_value);
   value->Set("booleans", booleans_value);
   value->Set("strings", strings_value);
   value->Set("integers", integers_value);
   return scoped_ptr<base::DictionaryValue>(value);
 }
 
 static base::Value* CreateItemValue(int val) {
   base::DictionaryValue* value(new base::DictionaryValue());
-  value->Set("val", base::Value::CreateIntegerValue(val));
+  value->Set("val", new base::FundamentalValue(val));
   return value;
 }
 
 }  // namespace
 
 TEST(JsonSchemaCompilerArrayTest, BasicArrayType) {
   {
     scoped_ptr<base::DictionaryValue> value = CreateBasicArrayTypeDictionary();
     scoped_ptr<BasicArrayType> basic_array_type(new BasicArrayType());
     ASSERT_TRUE(BasicArrayType::Populate(*value, basic_array_type.get()));
@@ skipping 155 matching lines @@
     EXPECT_TRUE(RefArrayType::Populate(*value, ref_array_type.get()));
     ASSERT_EQ(3u, ref_array_type->refs.size());
     EXPECT_EQ(1, ref_array_type->refs[0]->val);
     EXPECT_EQ(2, ref_array_type->refs[1]->val);
     EXPECT_EQ(3, ref_array_type->refs[2]->val);
   }
   {
     scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
     scoped_ptr<base::ListValue> not_ref_array(new base::ListValue());
     not_ref_array->Append(CreateItemValue(1));
-    not_ref_array->Append(base::Value::CreateIntegerValue(3));
+    not_ref_array->Append(new base::FundamentalValue(3));
     value->Set("refs", not_ref_array.release());
     scoped_ptr<RefArrayType> ref_array_type(new RefArrayType());
     EXPECT_FALSE(RefArrayType::Populate(*value, ref_array_type.get()));
   }
 }
 
 TEST(JsonSchemaCompilerArrayTest, IntegerArrayParamsCreate) {
   scoped_ptr<base::ListValue> params_value(new base::ListValue());
   scoped_ptr<base::ListValue> integer_array(new base::ListValue());
-  integer_array->Append(base::Value::CreateIntegerValue(2));
-  integer_array->Append(base::Value::CreateIntegerValue(4));
-  integer_array->Append(base::Value::CreateIntegerValue(8));
+  integer_array->Append(new base::FundamentalValue(2));
+  integer_array->Append(new base::FundamentalValue(4));
+  integer_array->Append(new base::FundamentalValue(8));
   params_value->Append(integer_array.release());
   scoped_ptr<IntegerArray::Params> params(
       IntegerArray::Params::Create(*params_value));
   EXPECT_TRUE(params.get());
   ASSERT_EQ(3u, params->nums.size());
   EXPECT_EQ(2, params->nums[0]);
   EXPECT_EQ(4, params->nums[1]);
   EXPECT_EQ(8, params->nums[2]);
 }
 
 TEST(JsonSchemaCompilerArrayTest, AnyArrayParamsCreate) {
   scoped_ptr<base::ListValue> params_value(new base::ListValue());
   scoped_ptr<base::ListValue> any_array(new base::ListValue());
-  any_array->Append(base::Value::CreateIntegerValue(1));
+  any_array->Append(new base::FundamentalValue(1));
   any_array->Append(base::Value::CreateStringValue("test"));
   any_array->Append(CreateItemValue(2));
   params_value->Append(any_array.release());
   scoped_ptr<AnyArray::Params> params(
       AnyArray::Params::Create(*params_value));
   EXPECT_TRUE(params.get());
   ASSERT_EQ(3u, params->anys.size());
   int int_temp = 0;
   EXPECT_TRUE(params->anys[0]->GetAsInteger(&int_temp));
   EXPECT_EQ(1, int_temp);
@@ skipping 29 matching lines @@
 
 TEST(JsonSchemaCompilerArrayTest, ReturnIntegerArrayResultCreate) {
   std::vector<int> integers;
   integers.push_back(1);
   integers.push_back(2);
   scoped_ptr<base::ListValue> results =
       ReturnIntegerArray::Results::Create(integers);
 
   base::ListValue expected;
   base::ListValue* expected_argument = new base::ListValue();
-  expected_argument->Append(base::Value::CreateIntegerValue(1));
-  expected_argument->Append(base::Value::CreateIntegerValue(2));
+  expected_argument->Append(new base::FundamentalValue(1));
+  expected_argument->Append(new base::FundamentalValue(2));
   expected.Append(expected_argument);
   EXPECT_TRUE(results->Equals(&expected));
 }
 
 TEST(JsonSchemaCompilerArrayTest, ReturnRefArrayResultCreate) {
   std::vector<linked_ptr<Item> > items;
   items.push_back(linked_ptr<Item>(new Item()));
   items.push_back(linked_ptr<Item>(new Item()));
   items[0]->val = 1;
   items[1]->val = 2;
   scoped_ptr<base::ListValue> results =
       ReturnRefArray::Results::Create(items);
 
   base::ListValue expected;
   base::ListValue* expected_argument = new base::ListValue();
   base::DictionaryValue* first = new base::DictionaryValue();
   first->SetInteger("val", 1);
   expected_argument->Append(first);
   base::DictionaryValue* second = new base::DictionaryValue();
   second->SetInteger("val", 2);
   expected_argument->Append(second);
   expected.Append(expected_argument);
   EXPECT_TRUE(results->Equals(&expected));
 }