| Index: device/serial/serial_device_enumerator_win.cc
|
| diff --git a/device/serial/serial_device_enumerator_win.cc b/device/serial/serial_device_enumerator_win.cc
|
| index e94564c5a71febfcce6a027f85901a9524a4c311..37e2dc4199ac03e71e3a8e761f5a2ae91d456f37 100644
|
| --- a/device/serial/serial_device_enumerator_win.cc
|
| +++ b/device/serial/serial_device_enumerator_win.cc
|
| @@ -4,13 +4,13 @@
|
|
|
| #include "device/serial/serial_device_enumerator_win.h"
|
|
|
| -#include <windows.h>
|
| -
|
| #include <devguid.h>
|
| #include <setupapi.h>
|
| #include <stdint.h>
|
| +#include <windows.h>
|
| +
|
| +#include <memory>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/metrics/sparse_histogram.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| @@ -39,7 +39,7 @@ bool GetProperty(HDEVINFO dev_info,
|
| if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
|
| return false;
|
|
|
| - scoped_ptr<wchar_t[]> buffer(new wchar_t[buffer_size]);
|
| + std::unique_ptr<wchar_t[]> buffer(new wchar_t[buffer_size]);
|
| if (!SetupDiGetDeviceRegistryProperty(dev_info, &dev_info_data, key, nullptr,
|
| reinterpret_cast<PBYTE>(buffer.get()),
|
| buffer_size, nullptr))
|
| @@ -154,8 +154,9 @@ mojo::Array<serial::DeviceInfoPtr> GetDevicesOld() {
|
| } // namespace
|
|
|
| // static
|
| -scoped_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
|
| - return scoped_ptr<SerialDeviceEnumerator>(new SerialDeviceEnumeratorWin());
|
| +std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
|
| + return std::unique_ptr<SerialDeviceEnumerator>(
|
| + new SerialDeviceEnumeratorWin());
|
| }
|
|
|
| SerialDeviceEnumeratorWin::SerialDeviceEnumeratorWin() {}
|
|
|