Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / tools / json_schema_compiler / test / choices_unittest.cc

diff --git a/src/tools/json_schema_compiler/test/choices_unittest.cc b/src/tools/json_schema_compiler/test/choices_unittest.cc
index 5be117c..2cf1d8d 100644 (file)
--- a/src/tools/json_schema_compiler/test/choices_unittest.cc
+++ b/src/tools/json_schema_compiler/test/choices_unittest.cc
@@ -18,22 +18,22 @@ using json_schema_compiler::test_util::Vector;
 
 TEST(JsonSchemaCompilerChoicesTest, TakesIntegersParamsCreate) {
   {
-    scoped_ptr<TakesIntegers::Params> params(TakesIntegers::Params::Create(
-        *List(base::Value::CreateBooleanValue(true))));
+    scoped_ptr<TakesIntegers::Params> params(
+        TakesIntegers::Params::Create(*List(new base::FundamentalValue(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);
@@ -71,7 +71,7 @@ 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(
@@ -81,9 +81,9 @@ TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
     scoped_ptr<base::DictionaryValue> object_param(new base::DictionaryValue());
     object_param->SetWithoutPathExpansion("strings",
-        base::Value::CreateStringValue("asdf"));
+                                          new base::StringValue("asdf"));
     object_param->SetWithoutPathExpansion("integers",
-        base::Value::CreateStringValue("asdf"));
+                                          new base::StringValue("asdf"));
     scoped_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(object_param.release());
     scoped_ptr<ObjectWithChoices::Params> params(
@@ -93,7 +93,7 @@ TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreateFail) {
   {
     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(
@@ -109,7 +109,7 @@ TEST(JsonSchemaCompilerChoicesTest, PopulateChoiceType) {
 
   base::ListValue* strings_value = new base::ListValue();
   for (size_t i = 0; i < strings.size(); ++i)
-    strings_value->Append(base::Value::CreateStringValue(strings[i]));
+    strings_value->Append(new base::StringValue(strings[i]));
 
   base::DictionaryValue value;
   value.SetInteger("integers", 4);
@@ -128,9 +128,9 @@ TEST(JsonSchemaCompilerChoicesTest, PopulateChoiceType) {
 
 TEST(JsonSchemaCompilerChoicesTest, ChoiceTypeToValue) {
   base::ListValue* strings_value = new base::ListValue();
-  strings_value->Append(base::Value::CreateStringValue("list"));
-  strings_value->Append(base::Value::CreateStringValue("of"));
-  strings_value->Append(base::Value::CreateStringValue("strings"));
+  strings_value->Append(new base::StringValue("list"));
+  strings_value->Append(new base::StringValue("of"));
+  strings_value->Append(new base::StringValue("strings"));
 
   base::DictionaryValue value;
   value.SetInteger("integers", 5);