| Index: device/udev_linux/scoped_udev.h
|
| diff --git a/device/udev_linux/scoped_udev.h b/device/udev_linux/scoped_udev.h
|
| index 06e3926025418562a673e985de136c0edbc46965..a231d701a41719181e007e71819c70c70965e656 100644
|
| --- a/device/udev_linux/scoped_udev.h
|
| +++ b/device/udev_linux/scoped_udev.h
|
| @@ -5,7 +5,8 @@
|
| #ifndef DEVICE_UDEV_LINUX_SCOPED_UDEV_H_
|
| #define DEVICE_UDEV_LINUX_SCOPED_UDEV_H_
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "device/udev_linux/udev.h"
|
|
|
| #if !defined(USE_UDEV)
|
| @@ -35,10 +36,11 @@ struct UdevMonitorDeleter {
|
| }
|
| };
|
|
|
| -typedef scoped_ptr<udev, UdevDeleter> ScopedUdevPtr;
|
| -typedef scoped_ptr<udev_enumerate, UdevEnumerateDeleter> ScopedUdevEnumeratePtr;
|
| -typedef scoped_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr;
|
| -typedef scoped_ptr<udev_monitor, UdevMonitorDeleter> ScopedUdevMonitorPtr;
|
| +typedef std::unique_ptr<udev, UdevDeleter> ScopedUdevPtr;
|
| +typedef std::unique_ptr<udev_enumerate, UdevEnumerateDeleter>
|
| + ScopedUdevEnumeratePtr;
|
| +typedef std::unique_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr;
|
| +typedef std::unique_ptr<udev_monitor, UdevMonitorDeleter> ScopedUdevMonitorPtr;
|
|
|
| } // namespace device
|
|
|
|
|