| Index: extensions/common/api/bluetooth/bluetooth_manifest_data.h
|
| diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_data.h b/extensions/common/api/bluetooth/bluetooth_manifest_data.h
|
| index b47cf8bdde61bc95420925c55a84af7db85d0663..7239751de2ec04d38eb2981b16a96f2ca3bdb6d8 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_data.h
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_data.h
|
| @@ -22,7 +22,7 @@ namespace extensions {
|
| class BluetoothManifestData : public Extension::ManifestData {
|
| public:
|
| explicit BluetoothManifestData(
|
| - scoped_ptr<BluetoothManifestPermission> permission);
|
| + std::unique_ptr<BluetoothManifestPermission> permission);
|
| ~BluetoothManifestData() override;
|
|
|
| // Gets the BluetoothManifestData for |extension|, or NULL if none was
|
| @@ -38,15 +38,16 @@ class BluetoothManifestData : public Extension::ManifestData {
|
|
|
| // 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<BluetoothManifestData> FromValue(const base::Value& value,
|
| - base::string16* error);
|
| + static std::unique_ptr<BluetoothManifestData> FromValue(
|
| + const base::Value& value,
|
| + base::string16* error);
|
|
|
| const BluetoothManifestPermission* permission() const {
|
| return permission_.get();
|
| }
|
|
|
| private:
|
| - scoped_ptr<BluetoothManifestPermission> permission_;
|
| + std::unique_ptr<BluetoothManifestPermission> permission_;
|
| };
|
|
|
| // Used for checking bluetooth permission.
|
|
|