Index: base/values_unittest.cc |
diff --git a/base/values_unittest.cc b/base/values_unittest.cc |
index 553e8e15080a083712232ee45b21b077e6fb99de..7b48e25c0038f8982fd23243c107ab8e460e234c 100644 |
--- a/base/values_unittest.cc |
+++ b/base/values_unittest.cc |
@@ -132,11 +132,11 @@ TEST(ValuesTest, StringValue) { |
// Test overloaded CreateStringValue. |
scoped_ptr<Value> narrow_value(Value::CreateStringValue("narrow")); |
ASSERT_TRUE(narrow_value.get()); |
- ASSERT_TRUE(narrow_value->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(narrow_value->IsString()); |
scoped_ptr<Value> utf16_value( |
Value::CreateStringValue(ASCIIToUTF16("utf16"))); |
ASSERT_TRUE(utf16_value.get()); |
- ASSERT_TRUE(utf16_value->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(utf16_value->IsString()); |
// Test overloaded GetString. |
std::string narrow = "http://google.com"; |
@@ -361,13 +361,13 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("null", ©_null)); |
ASSERT_TRUE(copy_null); |
ASSERT_NE(copy_null, original_null); |
- ASSERT_TRUE(copy_null->IsType(Value::TYPE_NULL)); |
+ ASSERT_TRUE(copy_null->IsNull()); |
Value* copy_bool = NULL; |
ASSERT_TRUE(copy_dict->Get("bool", ©_bool)); |
ASSERT_TRUE(copy_bool); |
ASSERT_NE(copy_bool, original_bool); |
- ASSERT_TRUE(copy_bool->IsType(Value::TYPE_BOOLEAN)); |
+ ASSERT_TRUE(copy_bool->IsBoolean()); |
bool copy_bool_value = false; |
ASSERT_TRUE(copy_bool->GetAsBoolean(©_bool_value)); |
ASSERT_TRUE(copy_bool_value); |
@@ -376,7 +376,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("int", ©_int)); |
ASSERT_TRUE(copy_int); |
ASSERT_NE(copy_int, original_int); |
- ASSERT_TRUE(copy_int->IsType(Value::TYPE_INTEGER)); |
+ ASSERT_TRUE(copy_int->IsInteger()); |
int copy_int_value = 0; |
ASSERT_TRUE(copy_int->GetAsInteger(©_int_value)); |
ASSERT_EQ(42, copy_int_value); |
@@ -385,7 +385,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("double", ©_double)); |
ASSERT_TRUE(copy_double); |
ASSERT_NE(copy_double, original_double); |
- ASSERT_TRUE(copy_double->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(copy_double->IsDouble()); |
double copy_double_value = 0; |
ASSERT_TRUE(copy_double->GetAsDouble(©_double_value)); |
ASSERT_EQ(3.14, copy_double_value); |
@@ -394,7 +394,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("string", ©_string)); |
ASSERT_TRUE(copy_string); |
ASSERT_NE(copy_string, original_string); |
- ASSERT_TRUE(copy_string->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(copy_string->IsString()); |
std::string copy_string_value; |
string16 copy_string16_value; |
ASSERT_TRUE(copy_string->GetAsString(©_string_value)); |
@@ -406,7 +406,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("string16", ©_string16)); |
ASSERT_TRUE(copy_string16); |
ASSERT_NE(copy_string16, original_string16); |
- ASSERT_TRUE(copy_string16->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(copy_string16->IsString()); |
ASSERT_TRUE(copy_string16->GetAsString(©_string_value)); |
ASSERT_TRUE(copy_string16->GetAsString(©_string16_value)); |
ASSERT_EQ(std::string("hello16"), copy_string_value); |
@@ -416,7 +416,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("binary", ©_binary)); |
ASSERT_TRUE(copy_binary); |
ASSERT_NE(copy_binary, original_binary); |
- ASSERT_TRUE(copy_binary->IsType(Value::TYPE_BINARY)); |
+ ASSERT_TRUE(copy_binary->IsBinary()); |
ASSERT_NE(original_binary->GetBuffer(), |
static_cast<BinaryValue*>(copy_binary)->GetBuffer()); |
ASSERT_EQ(original_binary->GetSize(), |
@@ -429,7 +429,7 @@ TEST(ValuesTest, DeepCopy) { |
ASSERT_TRUE(copy_dict->Get("list", ©_value)); |
ASSERT_TRUE(copy_value); |
ASSERT_NE(copy_value, original_list); |
- ASSERT_TRUE(copy_value->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(copy_value->IsList()); |
ListValue* copy_list = static_cast<ListValue*>(copy_value); |
ASSERT_EQ(2U, copy_list->GetSize()); |