Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2767)

Unified Diff: device/serial/serial_device_enumerator_win.cc

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/serial/serial_device_enumerator_mac.cc ('k') | device/serial/serial_io_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {}
« no previous file with comments | « device/serial/serial_device_enumerator_mac.cc ('k') | device/serial/serial_io_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698