Index: extensions/renderer/v8_schema_registry.cc |
diff --git a/extensions/renderer/v8_schema_registry.cc b/extensions/renderer/v8_schema_registry.cc |
index 851b01171413853e7bbac99df035d2884ab325dd..cd24d4d6411cb992634d1fc7e863ddb5f33fcca5 100644 |
--- a/extensions/renderer/v8_schema_registry.cc |
+++ b/extensions/renderer/v8_schema_registry.cc |
@@ -24,7 +24,7 @@ namespace { |
class SchemaRegistryNativeHandler : public ObjectBackedNativeHandler { |
public: |
SchemaRegistryNativeHandler(V8SchemaRegistry* registry, |
- scoped_ptr<ScriptContext> context) |
+ std::unique_ptr<ScriptContext> context) |
: ObjectBackedNativeHandler(context.get()), |
context_(std::move(context)), |
registry_(registry) { |
@@ -41,7 +41,7 @@ class SchemaRegistryNativeHandler : public ObjectBackedNativeHandler { |
registry_->GetSchema(*v8::String::Utf8Value(args[0]))); |
} |
- scoped_ptr<ScriptContext> context_; |
+ std::unique_ptr<ScriptContext> context_; |
V8SchemaRegistry* registry_; |
}; |
@@ -53,15 +53,15 @@ V8SchemaRegistry::V8SchemaRegistry() { |
V8SchemaRegistry::~V8SchemaRegistry() { |
} |
-scoped_ptr<NativeHandler> V8SchemaRegistry::AsNativeHandler() { |
- scoped_ptr<ScriptContext> context( |
+std::unique_ptr<NativeHandler> V8SchemaRegistry::AsNativeHandler() { |
+ std::unique_ptr<ScriptContext> context( |
new ScriptContext(GetOrCreateContext(v8::Isolate::GetCurrent()), |
NULL, // no frame |
NULL, // no extension |
Feature::UNSPECIFIED_CONTEXT, |
NULL, // no effective extension |
Feature::UNSPECIFIED_CONTEXT)); |
- return scoped_ptr<NativeHandler>( |
+ return std::unique_ptr<NativeHandler>( |
new SchemaRegistryNativeHandler(this, std::move(context))); |
} |
@@ -99,7 +99,8 @@ v8::Local<v8::Object> V8SchemaRegistry::GetSchema(const std::string& api) { |
const base::DictionaryValue* schema = |
ExtensionAPI::GetSharedInstance()->GetSchema(api); |
CHECK(schema) << api; |
- scoped_ptr<V8ValueConverter> v8_value_converter(V8ValueConverter::create()); |
+ std::unique_ptr<V8ValueConverter> v8_value_converter( |
+ V8ValueConverter::create()); |
v8::Local<v8::Value> value = v8_value_converter->ToV8Value(schema, context); |
CHECK(!value.IsEmpty()); |