| Index: device/nfc/nfc_tag_chromeos.h
|
| diff --git a/device/nfc/nfc_tag_chromeos.h b/device/nfc/nfc_tag_chromeos.h
|
| index 590349303fd85f0ddf2c1c201492219edf22a445..59fdd32fe21928bfb960cfa8ae9aa2b4b882d419 100644
|
| --- a/device/nfc/nfc_tag_chromeos.h
|
| +++ b/device/nfc/nfc_tag_chromeos.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef DEVICE_NFC_NFC_TAG_CHROMEOS_H_
|
| #define DEVICE_NFC_NFC_TAG_CHROMEOS_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "chromeos/dbus/nfc_tag_client.h"
|
| #include "dbus/object_path.h"
|
| @@ -57,7 +57,7 @@ class NfcTagChromeOS : public device::NfcTag,
|
|
|
| // The NfcNdefTagTechnology instance that allows users to perform NDEF
|
| // read and write on this tag.
|
| - scoped_ptr<NfcNdefTagTechnologyChromeOS> ndef_technology_;
|
| + std::unique_ptr<NfcNdefTagTechnologyChromeOS> ndef_technology_;
|
|
|
| // List of observers interested in event notifications from us.
|
| base::ObserverList<device::NfcTag::Observer> observers_;
|
|
|