| Index: extensions/common/api/sockets/sockets_manifest_data.cc
|
| diff --git a/extensions/common/api/sockets/sockets_manifest_data.cc b/extensions/common/api/sockets/sockets_manifest_data.cc
|
| index 9cedcf8c6afb5ae0240c37c19a17bc8f5b5a385b..1b877bb867ef69de07f5ba943f9c8f3831a77b2d 100644
|
| --- a/extensions/common/api/sockets/sockets_manifest_data.cc
|
| +++ b/extensions/common/api/sockets/sockets_manifest_data.cc
|
| @@ -12,7 +12,7 @@
|
| namespace extensions {
|
|
|
| SocketsManifestData::SocketsManifestData(
|
| - scoped_ptr<SocketsManifestPermission> permission)
|
| + std::unique_ptr<SocketsManifestPermission> permission)
|
| : permission_(std::move(permission)) {
|
| DCHECK(permission_);
|
| }
|
| @@ -37,15 +37,15 @@ bool SocketsManifestData::CheckRequest(
|
| }
|
|
|
| // static
|
| -scoped_ptr<SocketsManifestData> SocketsManifestData::FromValue(
|
| +std::unique_ptr<SocketsManifestData> SocketsManifestData::FromValue(
|
| const base::Value& value,
|
| base::string16* error) {
|
| - scoped_ptr<SocketsManifestPermission> permission =
|
| + std::unique_ptr<SocketsManifestPermission> permission =
|
| SocketsManifestPermission::FromValue(value, error);
|
| if (!permission)
|
| - return scoped_ptr<SocketsManifestData>();
|
| + return std::unique_ptr<SocketsManifestData>();
|
|
|
| - return scoped_ptr<SocketsManifestData>(
|
| + return std::unique_ptr<SocketsManifestData>(
|
| new SocketsManifestData(std::move(permission)));
|
| }
|
|
|
|
|