| Index: content/renderer/v8_value_converter_browsertest.cc
|
| diff --git a/content/renderer/v8_value_converter_browsertest.cc b/content/renderer/v8_value_converter_browsertest.cc
|
| index 7eed5f4d9efa25a9b56c19ab0e5a8c606ab313b4..9856b7d9a1350a4e614a20b00cc2cee51b758c6c 100644
|
| --- a/content/renderer/v8_value_converter_browsertest.cc
|
| +++ b/content/renderer/v8_value_converter_browsertest.cc
|
| @@ -137,27 +137,27 @@ class V8ValueConverterTest : public testing::Test {
|
|
|
| TEST_F(V8ValueConverterTest, BasicRoundTrip) {
|
| DictionaryValue original_root;
|
| - original_root.Set("null", Value::CreateNullValue());
|
| - original_root.Set("true", Value::CreateBooleanValue(true));
|
| - original_root.Set("false", Value::CreateBooleanValue(false));
|
| - original_root.Set("positive-int", Value::CreateIntegerValue(42));
|
| - original_root.Set("negative-int", Value::CreateIntegerValue(-42));
|
| - original_root.Set("zero", Value::CreateIntegerValue(0));
|
| - original_root.Set("double", Value::CreateDoubleValue(88.8));
|
| + original_root.Set("null", base::NullValue());
|
| + original_root.Set("true", base::TrueValue());
|
| + original_root.Set("false", base::FalseValue());
|
| + original_root.Set("positive-int", base::NumberValue::New(42));
|
| + original_root.Set("negative-int", base::NumberValue::New(-42));
|
| + original_root.Set("zero", base::NumberValue::New(0));
|
| + original_root.Set("double", base::NumberValue::New(88.8));
|
| original_root.Set("big-integral-double",
|
| - Value::CreateDoubleValue(pow(2.0, 53)));
|
| - original_root.Set("string", Value::CreateStringValue("foobar"));
|
| - original_root.Set("empty-string", Value::CreateStringValue(""));
|
| + base::NumberValue::New(pow(2.0, 53)));
|
| + original_root.Set("string", base::StringValue::New("foobar"));
|
| + original_root.Set("empty-string", base::StringValue::New(""));
|
|
|
| DictionaryValue* original_sub1 = new DictionaryValue();
|
| - original_sub1->Set("foo", Value::CreateStringValue("bar"));
|
| - original_sub1->Set("hot", Value::CreateStringValue("dog"));
|
| + original_sub1->Set("foo", base::StringValue::New("bar"));
|
| + original_sub1->Set("hot", base::StringValue::New("dog"));
|
| original_root.Set("dictionary", original_sub1);
|
| original_root.Set("empty-dictionary", new DictionaryValue());
|
|
|
| ListValue* original_sub2 = new ListValue();
|
| - original_sub2->Append(Value::CreateStringValue("monkey"));
|
| - original_sub2->Append(Value::CreateStringValue("balls"));
|
| + original_sub2->Append(base::StringValue::New("monkey"));
|
| + original_sub2->Append(base::StringValue::New("balls"));
|
| original_root.Set("list", original_sub2);
|
| original_root.Set("empty-list", new ListValue());
|
|
|
| @@ -193,7 +193,7 @@ TEST_F(V8ValueConverterTest, BasicRoundTrip) {
|
|
|
| TEST_F(V8ValueConverterTest, KeysWithDots) {
|
| DictionaryValue original;
|
| - original.SetWithoutPathExpansion("foo.bar", Value::CreateStringValue("baz"));
|
| + original.SetWithoutPathExpansion("foo.bar", base::StringValue::New("baz"));
|
|
|
| v8::Context::Scope context_scope(context_);
|
| v8::HandleScope handle_scope;
|
| @@ -272,8 +272,8 @@ TEST_F(V8ValueConverterTest, ArrayExceptions) {
|
|
|
| // Converting to v8 value should drop the first item and leave a hole.
|
| converted.reset(new ListValue());
|
| - converted->Append(Value::CreateStringValue("foo"));
|
| - converted->Append(Value::CreateStringValue("bar"));
|
| + converted->Append(base::StringValue::New("foo"));
|
| + converted->Append(base::StringValue::New("bar"));
|
| v8::Handle<v8::Array> copy =
|
| converter.ToV8Value(converted.get(), context_).As<v8::Array>();
|
| ASSERT_FALSE(copy.IsEmpty());
|
| @@ -298,11 +298,11 @@ TEST_F(V8ValueConverterTest, WeirdTypes) {
|
|
|
| converter.set_allow_date(true);
|
| TestWeirdType(converter, v8::Date::New(1000), Value::TYPE_DOUBLE,
|
| - Value::CreateDoubleValue(1));
|
| + base::NumberValue::New(1));
|
|
|
| converter.set_allow_regexp(true);
|
| TestWeirdType(converter, regex, Value::TYPE_STRING,
|
| - Value::CreateStringValue("/./"));
|
| + base::StringValue::New("/./"));
|
| }
|
|
|
| TEST_F(V8ValueConverterTest, Prototype) {
|
|
|