Index: components/user_prefs/tracked/device_id_win.cc |
diff --git a/components/user_prefs/tracked/device_id_win.cc b/components/user_prefs/tracked/device_id_win.cc |
index 579d509dd17b397d590d9df2bc192e59ebdffacd..455c7ca248ec6875b09b871161f8804dafcf64c2 100644 |
--- a/components/user_prefs/tracked/device_id_win.cc |
+++ b/components/user_prefs/tracked/device_id_win.cc |
@@ -4,12 +4,13 @@ |
#include "components/user_prefs/tracked/device_id.h" |
-#include <windows.h> |
#include <sddl.h> // For ConvertSidToStringSidA. |
+#include <windows.h> |
gab
2016/04/22 18:17:31
windows.h always has to be first
dcheng
2016/04/22 18:23:32
Doh, thanks. I had to manually stage a lot of the
|
+ |
+#include <memory> |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
MachineIdStatus GetDeterministicMachineSpecificId(std::string* machine_id) { |
DCHECK(machine_id); |
@@ -24,7 +25,7 @@ MachineIdStatus GetDeterministicMachineSpecificId(std::string* machine_id) { |
char sid_buffer[SECURITY_MAX_SID_SIZE]; |
SID* sid = reinterpret_cast<SID*>(sid_buffer); |
DWORD domain_size = 128; // Will expand below if needed. |
- scoped_ptr<wchar_t[]> domain_buffer(new wchar_t[domain_size]); |
+ std::unique_ptr<wchar_t[]> domain_buffer(new wchar_t[domain_size]); |
SID_NAME_USE sid_name_use; |
// Although the fifth argument to |LookupAccountNameW()|, |