Index: ui/events/ozone/device/device_manager.cc |
diff --git a/ui/events/ozone/device/device_manager.cc b/ui/events/ozone/device/device_manager.cc |
index 9811fc58f8816e990a2ca3568b6c2926e510a3be..cf32812d1083de9c25a9970960d5abb73e6c3feb 100644 |
--- a/ui/events/ozone/device/device_manager.cc |
+++ b/ui/events/ozone/device/device_manager.cc |
@@ -4,6 +4,7 @@ |
#include "ui/events/ozone/device/device_manager.h" |
+#include "base/memory/ptr_util.h" |
#include "base/trace_event/trace_event.h" |
#if defined(USE_UDEV) |
@@ -14,12 +15,12 @@ |
namespace ui { |
-scoped_ptr<DeviceManager> CreateDeviceManager() { |
-TRACE_EVENT0("ozone", "CreateDeviceManager"); |
+std::unique_ptr<DeviceManager> CreateDeviceManager() { |
+ TRACE_EVENT0("ozone", "CreateDeviceManager"); |
#if defined(USE_UDEV) |
- return make_scoped_ptr(new DeviceManagerUdev()); |
+ return base::WrapUnique(new DeviceManagerUdev()); |
#else |
- return make_scoped_ptr(new DeviceManagerManual()); |
+ return base::WrapUnique(new DeviceManagerManual()); |
#endif |
} |