| Index: device/serial/serial_device_enumerator_mac.cc
|
| diff --git a/device/serial/serial_device_enumerator_mac.cc b/device/serial/serial_device_enumerator_mac.cc
|
| index ff0b5fadaeeb114a736cc892c88d1df581c18834..2c81d78fbbed700a1e02fd50ea332964fcd217af 100644
|
| --- a/device/serial/serial_device_enumerator_mac.cc
|
| +++ b/device/serial/serial_device_enumerator_mac.cc
|
| @@ -9,6 +9,7 @@
|
| #include <stdint.h>
|
|
|
| #include <algorithm>
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/files/file_enumerator.h"
|
| @@ -16,7 +17,6 @@
|
| #include "base/files/file_util.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| #include "base/mac/scoped_ioobject.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "base/strings/pattern.h"
|
| #include "base/strings/string_util.h"
|
| @@ -204,8 +204,9 @@ mojo::Array<serial::DeviceInfoPtr> GetDevicesOld() {
|
| } // namespace
|
|
|
| // static
|
| -scoped_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
|
| - return scoped_ptr<SerialDeviceEnumerator>(new SerialDeviceEnumeratorMac());
|
| +std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
|
| + return std::unique_ptr<SerialDeviceEnumerator>(
|
| + new SerialDeviceEnumeratorMac());
|
| }
|
|
|
| SerialDeviceEnumeratorMac::SerialDeviceEnumeratorMac() {}
|
|
|