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

Unified Diff: sandbox/win/src/acl.cc

Issue 1849323003: Convert //sandbox to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixup nonsfi_sandbox_unittest.cc 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 | « sandbox/win/src/acl.h ('k') | sandbox/win/src/address_sanitizer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/acl.cc
diff --git a/sandbox/win/src/acl.cc b/sandbox/win/src/acl.cc
index f5de0981b3b2f653c3bf17ddbb8556ccadb8de62..539c180b8472f61050b54964f08dca4c943179a9 100644
--- a/sandbox/win/src/acl.cc
+++ b/sandbox/win/src/acl.cc
@@ -14,7 +14,7 @@ namespace sandbox {
bool GetDefaultDacl(
HANDLE token,
- scoped_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter>* default_dacl) {
+ std::unique_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter>* default_dacl) {
if (token == NULL)
return false;
@@ -64,7 +64,7 @@ bool AddSidToDefaultDacl(HANDLE token,
if (token == NULL)
return false;
- scoped_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter> default_dacl;
+ std::unique_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter> default_dacl;
if (!GetDefaultDacl(token, &default_dacl))
return false;
@@ -86,7 +86,7 @@ bool RevokeLogonSidFromDefaultDacl(HANDLE token) {
DWORD size = sizeof(TOKEN_GROUPS) + SECURITY_MAX_SID_SIZE;
TOKEN_GROUPS* logon_sid = reinterpret_cast<TOKEN_GROUPS*>(malloc(size));
- scoped_ptr<TOKEN_GROUPS, base::FreeDeleter> logon_sid_ptr(logon_sid);
+ std::unique_ptr<TOKEN_GROUPS, base::FreeDeleter> logon_sid_ptr(logon_sid);
if (!::GetTokenInformation(token, TokenLogonSid, logon_sid, size, &size))
return false;
@@ -103,7 +103,7 @@ bool AddUserSidToDefaultDacl(HANDLE token, ACCESS_MASK access) {
DWORD size = sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE;
TOKEN_USER* token_user = reinterpret_cast<TOKEN_USER*>(malloc(size));
- scoped_ptr<TOKEN_USER, base::FreeDeleter> token_user_ptr(token_user);
+ std::unique_ptr<TOKEN_USER, base::FreeDeleter> token_user_ptr(token_user);
if (!::GetTokenInformation(token, TokenUser, token_user, size, &size))
return false;
« no previous file with comments | « sandbox/win/src/acl.h ('k') | sandbox/win/src/address_sanitizer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698