Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / extensions / send_request_natives.cc

diff --git a/src/chrome/renderer/extensions/send_request_natives.cc b/src/chrome/renderer/extensions/send_request_natives.cc
index db07d43..49a7078 100644 (file)
--- a/src/chrome/renderer/extensions/send_request_natives.cc
+++ b/src/chrome/renderer/extensions/send_request_natives.cc
@@ -38,7 +38,8 @@ void SendRequestNatives::GetNextRequestId(
 // callback will be dispatched to EventBindings::HandleResponse.
 void SendRequestNatives::StartRequest(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
-  std::string name = *v8::String::AsciiValue(args[0]);
+  CHECK_EQ(6, args.Length());
+  std::string name = *v8::String::Utf8Value(args[0]);
   int request_id = args[2]->Int32Value();
   bool has_callback = args[3]->BooleanValue();
   bool for_io_thread = args[4]->BooleanValue();
@@ -53,16 +54,16 @@ void SendRequestNatives::StartRequest(
   if (!preserve_null_in_objects)
     converter->SetStripNullFromObjects(true);
 
-  scoped_ptr<Value> value_args(
+  scoped_ptr<base::Value> value_args(
       converter->FromV8Value(args[1], context()->v8_context()));
-  if (!value_args.get() || !value_args->IsType(Value::TYPE_LIST)) {
+  if (!value_args.get() || !value_args->IsType(base::Value::TYPE_LIST)) {
     NOTREACHED() << "Unable to convert args passed to StartRequest";
     return;
   }
 
   request_sender_->StartRequest(
       context(), name, request_id, has_callback, for_io_thread,
-      static_cast<ListValue*>(value_args.get()));
+      static_cast<base::ListValue*>(value_args.get()));
 }
 
 void SendRequestNatives::GetGlobal(