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

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

Issue 169193002: Convert scoped_ptr_malloc -> scoped_ptr, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 10 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/process_thread_policy.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 70d2a8d31097e6cc11af5a814202e92c896f3805..0951e14840c807b2c8ce482ef23d1eac68265202 100644
--- a/sandbox/win/src/acl.cc
+++ b/sandbox/win/src/acl.cc
@@ -11,8 +11,9 @@
namespace sandbox {
-bool GetDefaultDacl(HANDLE token,
- scoped_ptr_malloc<TOKEN_DEFAULT_DACL>* default_dacl) {
+bool GetDefaultDacl(
+ HANDLE token,
+ scoped_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter>* default_dacl) {
if (token == NULL)
return false;
@@ -59,7 +60,7 @@ bool AddSidToDefaultDacl(HANDLE token, const Sid& sid, ACCESS_MASK access) {
if (token == NULL)
return false;
- scoped_ptr_malloc<TOKEN_DEFAULT_DACL> default_dacl;
+ scoped_ptr<TOKEN_DEFAULT_DACL, base::FreeDeleter> default_dacl;
if (!GetDefaultDacl(token, &default_dacl))
return false;
@@ -80,7 +81,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_malloc<TOKEN_USER> token_user_ptr(token_user);
+ scoped_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/process_thread_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698