| Index: content/renderer/java/gin_java_function_invocation_helper.cc
|
| diff --git a/content/renderer/java/gin_java_function_invocation_helper.cc b/content/renderer/java/gin_java_function_invocation_helper.cc
|
| index 428a954fdd75cbec5aba5fb6de98935ab8fd094c..c1729e55c12408e619a0787b203d0cd5b24deeda 100644
|
| --- a/content/renderer/java/gin_java_function_invocation_helper.cc
|
| +++ b/content/renderer/java/gin_java_function_invocation_helper.cc
|
| @@ -61,7 +61,7 @@ v8::Local<v8::Value> GinJavaFunctionInvocationHelper::Invoke(
|
| v8::Local<v8::Context> context = args->isolate()->GetCurrentContext();
|
| v8::Local<v8::Value> val;
|
| while (args->GetNext(&val)) {
|
| - scoped_ptr<base::Value> arg(converter_->FromV8Value(val, context));
|
| + std::unique_ptr<base::Value> arg(converter_->FromV8Value(val, context));
|
| if (arg.get()) {
|
| arguments.Append(arg.release());
|
| } else {
|
| @@ -71,7 +71,7 @@ v8::Local<v8::Value> GinJavaFunctionInvocationHelper::Invoke(
|
| }
|
|
|
| GinJavaBridgeError error;
|
| - scoped_ptr<base::Value> result = dispatcher_->InvokeJavaMethod(
|
| + std::unique_ptr<base::Value> result = dispatcher_->InvokeJavaMethod(
|
| object->object_id(), method_name_, arguments, &error);
|
| if (!result.get()) {
|
| args->isolate()->ThrowException(v8::Exception::Error(gin::StringToV8(
|
| @@ -83,7 +83,7 @@ v8::Local<v8::Value> GinJavaFunctionInvocationHelper::Invoke(
|
| args->isolate()->GetCurrentContext());
|
| }
|
|
|
| - scoped_ptr<const GinJavaBridgeValue> gin_value =
|
| + std::unique_ptr<const GinJavaBridgeValue> gin_value =
|
| GinJavaBridgeValue::FromValue(result.get());
|
| if (gin_value->IsType(GinJavaBridgeValue::TYPE_OBJECT_ID)) {
|
| GinJavaBridgeObject* result = NULL;
|
|
|