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

Unified Diff: device/serial/serial_device_enumerator_mac.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_linux.cc ('k') | device/serial/serial_device_enumerator_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {}
« no previous file with comments | « device/serial/serial_device_enumerator_linux.cc ('k') | device/serial/serial_device_enumerator_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698