more changes

base/values_unittest.cc

Index: base/values_unittest.cc
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index 553e8e15080a083712232ee45b21b077e6fb99de..168de0751081ab6a97a66ad038728257dbcca75d 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -20,7 +20,7 @@ TEST(ValuesTest, Basic) {
   ASSERT_EQ(std::string("http://google.com"), homepage);
 
   ASSERT_FALSE(settings.Get("global", NULL));
-  settings.Set("global", Value::CreateBooleanValue(true));
+  settings.Set("global", TrueValue());
   ASSERT_TRUE(settings.Get("global", NULL));
   settings.SetString("global.homepage", "http://scurvy.com");
   ASSERT_TRUE(settings.Get("global", NULL));
@@ -57,13 +57,13 @@ TEST(ValuesTest, Basic) {
 
 TEST(ValuesTest, List) {
   scoped_ptr<ListValue> mixed_list(new ListValue());
-  mixed_list->Set(0, Value::CreateBooleanValue(true));
-  mixed_list->Set(1, Value::CreateIntegerValue(42));
-  mixed_list->Set(2, Value::CreateDoubleValue(88.8));
-  mixed_list->Set(3, Value::CreateStringValue("foo"));
+  mixed_list->Set(0, TrueValue());
+  mixed_list->Set(1, NumberValue::New(42));
+  mixed_list->Set(2, NumberValue::New(88.8));
+  mixed_list->Set(3, StringValue::New("foo"));
   ASSERT_EQ(4u, mixed_list->GetSize());
 
-  Value *value = NULL;
+  Value* value = NULL;
   bool bool_value = false;
   int int_value = 0;
   double double_value = 0.0;
@@ -86,7 +86,7 @@ TEST(ValuesTest, List) {
   ASSERT_TRUE(bool_value);
   ASSERT_TRUE(mixed_list->GetInteger(1, &int_value));
   ASSERT_EQ(42, int_value);
-  // implicit conversion from Integer to Double should be possible.
+  // Implicit conversion from Integer to Double should be possible.
   ASSERT_TRUE(mixed_list->GetDouble(1, &double_value));
   ASSERT_EQ(42, double_value);
   ASSERT_TRUE(mixed_list->GetDouble(2, &double_value));
@@ -129,12 +129,11 @@ TEST(ValuesTest, BinaryValue) {
 }
 
 TEST(ValuesTest, StringValue) {
-  // Test overloaded CreateStringValue.
-  scoped_ptr<Value> narrow_value(Value::CreateStringValue("narrow"));
+  // Test overloaded StringValue::New.
+  scoped_ptr<Value> narrow_value(StringValue::New("narrow"));
   ASSERT_TRUE(narrow_value.get());
   ASSERT_TRUE(narrow_value->IsType(Value::TYPE_STRING));
-  scoped_ptr<Value> utf16_value(
-      Value::CreateStringValue(ASCIIToUTF16("utf16")));
+  scoped_ptr<Value> utf16_value(StringValue::New(ASCIIToUTF16("utf16")));
   ASSERT_TRUE(utf16_value.get());
   ASSERT_TRUE(utf16_value->IsType(Value::TYPE_STRING));
 
@@ -196,7 +195,7 @@ TEST(ValuesTest, ListDeletion) {
     ListValue list;
     list.Append(new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
-    EXPECT_TRUE(list.Set(0, Value::CreateNullValue()));
+    EXPECT_TRUE(list.Set(0, NullValue()));
     EXPECT_TRUE(deletion_flag);
   }
 }
@@ -267,7 +266,7 @@ TEST(ValuesTest, DictionaryDeletion) {
     DictionaryValue dict;
     dict.Set(key, new DeletionTestValue(&deletion_flag));
     EXPECT_FALSE(deletion_flag);
-    dict.Set(key, Value::CreateNullValue());
+    dict.Set(key, NullValue());
     EXPECT_TRUE(deletion_flag);
   }
 }
@@ -305,8 +304,8 @@ TEST(ValuesTest, DictionaryRemoval) {
 
 TEST(ValuesTest, DictionaryWithoutPathExpansion) {
   DictionaryValue dict;
-  dict.Set("this.is.expanded", Value::CreateNullValue());
-  dict.SetWithoutPathExpansion("this.isnt.expanded", Value::CreateNullValue());
+  dict.Set("this.is.expanded", NullValue());
+  dict.SetWithoutPathExpansion("this.isnt.expanded", NullValue());
 
   EXPECT_FALSE(dict.HasKey("this.is.expanded"));
   EXPECT_TRUE(dict.HasKey("this"));
@@ -327,18 +326,17 @@ TEST(ValuesTest, DictionaryWithoutPathExpansion) {
 
 TEST(ValuesTest, DeepCopy) {
   DictionaryValue original_dict;
-  Value* original_null = Value::CreateNullValue();
+  Value* original_null = NullValue();
   original_dict.Set("null", original_null);
-  FundamentalValue* original_bool = Value::CreateBooleanValue(true);
+  BooleanValue* original_bool = TrueValue();
   original_dict.Set("bool", original_bool);
-  FundamentalValue* original_int = Value::CreateIntegerValue(42);
+  NumberValue* original_int = NumberValue::New(42);
   original_dict.Set("int", original_int);
-  FundamentalValue* original_double = Value::CreateDoubleValue(3.14);
+  NumberValue* original_double = NumberValue::New(3.14);
   original_dict.Set("double", original_double);
-  StringValue* original_string = Value::CreateStringValue("hello");
+  StringValue* original_string = StringValue::New("hello");
   original_dict.Set("string", original_string);
-  StringValue* original_string16 =
-      Value::CreateStringValue(ASCIIToUTF16("hello16"));
+  StringValue* original_string16 = StringValue::New(ASCIIToUTF16("hello16"));
   original_dict.Set("string16", original_string16);
 
   char* original_buffer = new char[42];
@@ -347,9 +345,9 @@ TEST(ValuesTest, DeepCopy) {
   original_dict.Set("binary", original_binary);
 
   ListValue* original_list = new ListValue();
-  FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0);
+  NumberValue* original_list_element_0 = NumberValue::New(0);
   original_list->Append(original_list_element_0);
-  FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1);
+  NumberValue* original_list_element_1 = NumberValue::New(1);
   original_list->Append(original_list_element_1);
   original_dict.Set("list", original_list);
 
@@ -451,12 +449,12 @@ TEST(ValuesTest, DeepCopy) {
 }
 
 TEST(ValuesTest, Equals) {
-  Value* null1 = Value::CreateNullValue();
-  Value* null2 = Value::CreateNullValue();
+  Value* null1 = NullValue();
+  Value* null2 = NullValue();
   EXPECT_NE(null1, null2);
   EXPECT_TRUE(null1->Equals(null2));
 
-  Value* boolean = Value::CreateBooleanValue(false);
+  Value* boolean = FalseValue();
   EXPECT_FALSE(null1->Equals(boolean));
   delete null1;
   delete null2;
@@ -468,14 +466,14 @@ TEST(ValuesTest, Equals) {
   dv.SetDouble("c", 2.5);
   dv.SetString("d1", "string");
   dv.SetString("d2", ASCIIToUTF16("http://google.com"));
-  dv.Set("e", Value::CreateNullValue());
+  dv.Set("e", NullValue());
 
   scoped_ptr<DictionaryValue> copy;
   copy.reset(dv.DeepCopy());
   EXPECT_TRUE(dv.Equals(copy.get()));
 
   ListValue* list = new ListValue;
-  list->Append(Value::CreateNullValue());
+  list->Append(NullValue());
   list->Append(new DictionaryValue);
   dv.Set("f", list);
 
@@ -483,7 +481,7 @@ TEST(ValuesTest, Equals) {
   copy->Set("f", list->DeepCopy());
   EXPECT_TRUE(dv.Equals(copy.get()));
 
-  list->Append(Value::CreateBooleanValue(true));
+  list->Append(TrueValue());
   EXPECT_FALSE(dv.Equals(copy.get()));
 
   // Check if Equals detects differences in only the keys.
@@ -495,14 +493,14 @@ TEST(ValuesTest, Equals) {
 }
 
 TEST(ValuesTest, StaticEquals) {
-  scoped_ptr<Value> null1(Value::CreateNullValue());
-  scoped_ptr<Value> null2(Value::CreateNullValue());
+  scoped_ptr<Value> null1(NullValue());
+  scoped_ptr<Value> null2(NullValue());
   EXPECT_TRUE(Value::Equals(null1.get(), null2.get()));
   EXPECT_TRUE(Value::Equals(NULL, NULL));
 
-  scoped_ptr<Value> i42(Value::CreateIntegerValue(42));
-  scoped_ptr<Value> j42(Value::CreateIntegerValue(42));
-  scoped_ptr<Value> i17(Value::CreateIntegerValue(17));
+  scoped_ptr<Value> i42(NumberValue::New(42));
+  scoped_ptr<Value> j42(NumberValue::New(42));
+  scoped_ptr<Value> i17(NumberValue::New(17));
   EXPECT_TRUE(Value::Equals(i42.get(), i42.get()));
   EXPECT_TRUE(Value::Equals(j42.get(), i42.get()));
   EXPECT_TRUE(Value::Equals(i42.get(), j42.get()));
@@ -510,7 +508,7 @@ TEST(ValuesTest, StaticEquals) {
   EXPECT_FALSE(Value::Equals(i42.get(), NULL));
   EXPECT_FALSE(Value::Equals(NULL, i42.get()));
 
-  // NULL and Value::CreateNullValue() are intentionally different: We need
+  // NULL and NullValue() are intentionally different: We need
   // support for NULL as a return value for "undefined" without caring for
   // ownership of the pointer.
   EXPECT_FALSE(Value::Equals(null1.get(), NULL));
@@ -519,18 +517,17 @@ TEST(ValuesTest, StaticEquals) {
 
 TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
   DictionaryValue original_dict;
-  Value* original_null = Value::CreateNullValue();
+  Value* original_null = NullValue();
   original_dict.Set("null", original_null);
-  FundamentalValue* original_bool = Value::CreateBooleanValue(true);
+  BooleanValue* original_bool = TrueValue();
   original_dict.Set("bool", original_bool);
-  FundamentalValue* original_int = Value::CreateIntegerValue(42);
+  NumberValue* original_int = NumberValue::New(42);
   original_dict.Set("int", original_int);
-  FundamentalValue* original_double = Value::CreateDoubleValue(3.14);
+  NumberValue* original_double = NumberValue::New(3.14);
   original_dict.Set("double", original_double);
-  StringValue* original_string = Value::CreateStringValue("hello");
+  StringValue* original_string = StringValue::New("hello");
   original_dict.Set("string", original_string);
-  StringValue* original_string16 =
-      Value::CreateStringValue(ASCIIToUTF16("hello16"));
+  StringValue* original_string16 = StringValue::New(ASCIIToUTF16("hello16"));
   original_dict.Set("string16", original_string16);
 
   char* original_buffer = new char[42];
@@ -539,9 +536,9 @@ TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
   original_dict.Set("binary", original_binary);
 
   ListValue* original_list = new ListValue();
-  FundamentalValue* original_list_element_0 = Value::CreateIntegerValue(0);
+  NumberValue* original_list_element_0 = NumberValue::New(0);
   original_list->Append(original_list_element_0);
-  FundamentalValue* original_list_element_1 = Value::CreateIntegerValue(1);
+  NumberValue* original_list_element_1 = NumberValue::New(1);
   original_list->Append(original_list_element_1);
   original_dict.Set("list", original_list);
 
@@ -638,7 +635,7 @@ TEST(ValuesTest, RemoveEmptyChildren) {
     ListValue* inner2 = new ListValue;
     inner->Append(new DictionaryValue);
     inner->Append(inner2);
-    inner2->Append(Value::CreateStringValue("hello"));
+    inner2->Append(StringValue::New("hello"));
     root.reset(root->DeepCopyWithoutEmptyChildren());
     EXPECT_EQ(3U, root->size());
     EXPECT_TRUE(root->GetList("list_with_empty_children", &inner));