Convert //sandbox to use std::unique_ptr

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"
 #include "base/memory/free_deleter.h"

[Will Harris, 2016/04/04 20:20:25]

general comment - why not include <memory> here and in other CC files - I
thought chromium style was to always explicit include everything even if you
know it's included by the header file for the cc file? (or maybe I am just wrong
about chromium style)

[Mostyn Bramley-Moore, 2016/04/04 20:48:36]

I can't find any discussion of this style preference in either the chromium
coding style or google c++ style guide document, but maybe it's there and I
missed it.

My preference is to skip the extra include for now (this change shouldn't
regress  the include-what-you-use situation), and consider applying IWYU more
widely/consistently across the tree later if the tool becomes mature enough.

Maybe dcheng has an opinion?

 
 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;
 
   DCHECK(default_dacl != NULL);
 
   unsigned long length = 0;
   ::GetTokenInformation(token, TokenDefaultDacl, NULL, 0, &length);
   if (length == 0) {
     NOTREACHED();
     return false;
@@ skipping 29 matching lines @@
   return true;
 }
 
 bool AddSidToDefaultDacl(HANDLE token,
                          const Sid& sid,
                          ACCESS_MODE access_mode,
                          ACCESS_MASK access) {
   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;
 
   ACL* new_dacl = NULL;
   if (!AddSidToDacl(sid, default_dacl->DefaultDacl, access_mode, 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 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;
   if (logon_sid->GroupCount < 1) {
     ::SetLastError(ERROR_INVALID_TOKEN);
     return false;
   }
   return AddSidToDefaultDacl(token,
                              reinterpret_cast<SID*>(logon_sid->Groups[0].Sid),
                              REVOKE_ACCESS, 0);
 }
 
 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;
 
   return AddSidToDefaultDacl(token,
                              reinterpret_cast<SID*>(token_user->User.Sid),
                              GRANT_ACCESS, access);
 }
 
 bool AddKnownSidToObject(HANDLE object, SE_OBJECT_TYPE object_type,
@@ skipping 20 matching lines @@
   ::LocalFree(new_dacl);
   ::LocalFree(descriptor);
 
   if (ERROR_SUCCESS != result)
     return false;
 
   return true;
 }
 
 }  // namespace sandbox