| Index: extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| index d72b226efffe6d694887c44f214243f2129ef1bd..859b569987c5daada6497d6ba1a0445d37a52890 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.h
|
| @@ -29,7 +29,7 @@ class BluetoothManifestPermission : public ManifestPermission {
|
|
|
| // Tries to construct the info based on |value|, as it would have appeared in
|
| // the manifest. Sets |error| and returns an empty scoped_ptr on failure.
|
| - static scoped_ptr<BluetoothManifestPermission> FromValue(
|
| + static std::unique_ptr<BluetoothManifestPermission> FromValue(
|
| const base::Value& value,
|
| base::string16* error);
|
|
|
| @@ -46,7 +46,7 @@ class BluetoothManifestPermission : public ManifestPermission {
|
| std::string id() const override;
|
| PermissionIDSet GetPermissions() const override;
|
| bool FromValue(const base::Value* value) override;
|
| - scoped_ptr<base::Value> ToValue() const override;
|
| + std::unique_ptr<base::Value> ToValue() const override;
|
| ManifestPermission* Diff(const ManifestPermission* rhs) const override;
|
| ManifestPermission* Union(const ManifestPermission* rhs) const override;
|
| ManifestPermission* Intersect(const ManifestPermission* rhs) const override;
|
|
|