| Index: content/renderer/v8_value_converter.cc
|
| diff --git a/content/renderer/v8_value_converter.cc b/content/renderer/v8_value_converter.cc
|
| index d2c21cd2cc10ae3fcab2d4365873a8f0f93ae73b..5bfb0a29f845cec5eb3af320122e26f483977625 100644
|
| --- a/content/renderer/v8_value_converter.cc
|
| +++ b/content/renderer/v8_value_converter.cc
|
| @@ -119,32 +119,32 @@ Value* V8ValueConverter::FromV8ValueImpl(v8::Handle<v8::Value> val) const {
|
| CHECK(!val.IsEmpty());
|
|
|
| if (val->IsNull())
|
| - return Value::CreateNullValue();
|
| + return base::NullValue();
|
|
|
| if (val->IsBoolean())
|
| - return Value::CreateBooleanValue(val->ToBoolean()->Value());
|
| + return base::BooleanValue::New(val->ToBoolean()->Value());
|
|
|
| if (val->IsInt32())
|
| - return Value::CreateIntegerValue(val->ToInt32()->Value());
|
| + return base::NumberValue::New(val->ToInt32()->Value());
|
|
|
| if (val->IsNumber())
|
| - return Value::CreateDoubleValue(val->ToNumber()->Value());
|
| + return base::NumberValue::New(val->ToNumber()->Value());
|
|
|
| if (val->IsString()) {
|
| v8::String::Utf8Value utf8(val->ToString());
|
| - return Value::CreateStringValue(std::string(*utf8, utf8.length()));
|
| + return base::StringValue::New(std::string(*utf8, utf8.length()));
|
| }
|
|
|
| if (allow_undefined_ && val->IsUndefined())
|
| - return Value::CreateNullValue();
|
| + return base::NullValue();
|
|
|
| if (allow_date_ && val->IsDate()) {
|
| v8::Date* date = v8::Date::Cast(*val);
|
| - return Value::CreateDoubleValue(date->NumberValue() / 1000.0);
|
| + return base::NumberValue::New(date->NumberValue() / 1000.0);
|
| }
|
|
|
| if (allow_regexp_ && val->IsRegExp()) {
|
| - return Value::CreateStringValue(
|
| + return base::StringValue::New(
|
| *v8::String::Utf8Value(val->ToString()));
|
| }
|
|
|
| @@ -156,7 +156,7 @@ Value* V8ValueConverter::FromV8ValueImpl(v8::Handle<v8::Value> val) const {
|
| return FromV8Object(val->ToObject());
|
|
|
| LOG(ERROR) << "Unexpected v8 value type encountered.";
|
| - return Value::CreateNullValue();
|
| + return base::NullValue();
|
| }
|
|
|
| ListValue* V8ValueConverter::FromV8Array(v8::Handle<v8::Array> val) const {
|
|
|