Convert scoped_ptr_malloc -> scoped_ptr, part 2.

sandbox/win/src/acl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/win/src/acl.h"
 
 #include <aclapi.h>
 #include <sddl.h>
 
 #include "base/logging.h"
 
 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;
 
   DCHECK(default_dacl != NULL);
 
   unsigned long length = 0;
   ::GetTokenInformation(token, TokenDefaultDacl, NULL, 0, &length);
   if (length == 0) {
     NOTREACHED();
     return false;
@@ skipping 26 matching lines @@
   if (ERROR_SUCCESS != ::SetEntriesInAcl(1, &new_access, old_dacl, new_dacl))
     return false;
 
   return true;
 }
 
 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;
 
   ACL* new_dacl = NULL;
   if (!AddSidToDacl(sid, default_dacl->DefaultDacl, access, &new_dacl))
     return false;
 
   TOKEN_DEFAULT_DACL new_token_dacl = {0};
   new_token_dacl.DefaultDacl = new_dacl;
 
   BOOL ret = ::SetTokenInformation(token, TokenDefaultDacl, &new_token_dacl,
                                    sizeof(new_token_dacl));
   ::LocalFree(new_dacl);
   return (TRUE == ret);
 }
 
 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;
 
   return AddSidToDefaultDacl(token,
                              reinterpret_cast<SID*>(token_user->User.Sid),
                              access);
 }
 
 bool AddKnownSidToKernelObject(HANDLE object, const Sid& sid,
@@ skipping 19 matching lines @@
   ::LocalFree(new_dacl);
   ::LocalFree(descriptor);
 
   if (ERROR_SUCCESS != result)
     return false;
 
   return true;
 }
 
 }  // namespace sandbox