Remove more CreateIntegerValue calls.

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 "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) {
   {
     scoped_ptr<TakesIntegers::Params> params(TakesIntegers::Params::Create(
         *List(base::Value::CreateBooleanValue(true))));
     EXPECT_FALSE(params);
   }
   {
-    scoped_ptr<TakesIntegers::Params> params(TakesIntegers::Params::Create(
-        *List(base::Value::CreateIntegerValue(6))));
+    scoped_ptr<TakesIntegers::Params> params(
+        TakesIntegers::Params::Create(*List(new base::FundamentalValue(6))));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->nums.as_integers);
     EXPECT_EQ(6, *params->nums.as_integer);
   }
   {
     scoped_ptr<TakesIntegers::Params> params(TakesIntegers::Params::Create(
-        *List(List(base::Value::CreateIntegerValue(2),
-                   base::Value::CreateIntegerValue(6),
-                   base::Value::CreateIntegerValue(8)).release())));
+        *List(List(new base::FundamentalValue(2),
+                   new base::FundamentalValue(6),
+                   new base::FundamentalValue(8)).release())));
     ASSERT_TRUE(params);
     ASSERT_TRUE(params->nums.as_integers);
     EXPECT_EQ(Vector(2, 6, 8), *params->nums.as_integers);
   }
 }
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
   {
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*List(
@@ skipping 17 matching lines @@
   }
 }
 
 // TODO(kalman): Clean up the rest of these tests to use the
 // Vector/List/Dictionary helpers.
 
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
     scoped_ptr<base::DictionaryValue> object_param(new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings",
-        base::Value::CreateIntegerValue(5));
+                                          new base::FundamentalValue(5));
     scoped_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(object_param.release());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     scoped_ptr<base::DictionaryValue> object_param(new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings",
         base::Value::CreateStringValue("asdf"));
     object_param->SetWithoutPathExpansion("integers",
         base::Value::CreateStringValue("asdf"));
     scoped_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(object_param.release());
     scoped_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(*params_value));
     EXPECT_FALSE(params.get());
   }
   {
     scoped_ptr<base::DictionaryValue> object_param(new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("integers",
-        base::Value::CreateIntegerValue(6));
+                                          new base::FundamentalValue(6));
     scoped_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(object_param.release());
     scoped_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 176 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