Index: extensions/common/api/bluetooth/bluetooth_manifest_data.cc |
diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_data.cc b/extensions/common/api/bluetooth/bluetooth_manifest_data.cc |
index 94ba7fe3bf2c8c47e4f02e7c84a723bb380d5824..c5d84205382c4d9166c091d5db57ced4509e84e6 100644 |
--- a/extensions/common/api/bluetooth/bluetooth_manifest_data.cc |
+++ b/extensions/common/api/bluetooth/bluetooth_manifest_data.cc |
@@ -12,7 +12,7 @@ |
namespace extensions { |
BluetoothManifestData::BluetoothManifestData( |
- scoped_ptr<BluetoothManifestPermission> permission) |
+ std::unique_ptr<BluetoothManifestPermission> permission) |
: permission_(std::move(permission)) { |
DCHECK(permission_); |
} |
@@ -56,15 +56,15 @@ bool BluetoothManifestData::CheckPeripheralPermitted( |
} |
// static |
-scoped_ptr<BluetoothManifestData> BluetoothManifestData::FromValue( |
+std::unique_ptr<BluetoothManifestData> BluetoothManifestData::FromValue( |
const base::Value& value, |
base::string16* error) { |
- scoped_ptr<BluetoothManifestPermission> permission = |
+ std::unique_ptr<BluetoothManifestPermission> permission = |
BluetoothManifestPermission::FromValue(value, error); |
if (!permission) |
- return scoped_ptr<BluetoothManifestData>(); |
+ return std::unique_ptr<BluetoothManifestData>(); |
- return scoped_ptr<BluetoothManifestData>( |
+ return std::unique_ptr<BluetoothManifestData>( |
new BluetoothManifestData(std::move(permission))); |
} |