Index: content/renderer/dom_automation_controller.cc |
=================================================================== |
--- content/renderer/dom_automation_controller.cc (revision 181443) |
+++ content/renderer/dom_automation_controller.cc (working copy) |
@@ -59,7 +59,7 @@ |
std::string json; |
JSONStringValueSerializer serializer(&json); |
- scoped_ptr<Value> value; |
+ scoped_ptr<base::Value> value; |
// Warning: note that JSON officially requires the root-level object to be |
// an object (e.g. {foo:3}) or an array, while here we're serializing |
@@ -69,15 +69,15 @@ |
// grabbing the 0th element to get the value out. |
switch (args[0].type) { |
case NPVariantType_String: { |
- value.reset(Value::CreateStringValue(args[0].ToString())); |
+ value.reset(new base::StringValue(args[0].ToString())); |
break; |
} |
case NPVariantType_Bool: { |
- value.reset(Value::CreateBooleanValue(args[0].ToBoolean())); |
+ value.reset(new base::FundamentalValue(args[0].ToBoolean())); |
break; |
} |
case NPVariantType_Int32: { |
- value.reset(Value::CreateIntegerValue(args[0].ToInt32())); |
+ value.reset(new base::FundamentalValue(args[0].ToInt32())); |
break; |
} |
case NPVariantType_Double: { |
@@ -85,7 +85,7 @@ |
// as a double in this binding. The reason being that KJS treats |
// any number value as a double. Refer for more details, |
// chrome/third_party/webkit/src/JavaScriptCore/bindings/c/c_utility.cpp |
- value.reset(Value::CreateIntegerValue(args[0].ToInt32())); |
+ value.reset(new base::FundamentalValue(args[0].ToInt32())); |
break; |
} |
default: { |
@@ -104,7 +104,6 @@ |
result->Set(succeeded); |
automation_id_ = MSG_ROUTING_NONE; |
- |
} |
void DomAutomationController::SendJSON(const CppArgumentList& args, |