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

Unified Diff: sandbox/win/src/restricted_token.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/process_thread_policy.cc ('k') | sandbox/win/src/sandbox_policy_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/win/src/restricted_token.cc
diff --git a/sandbox/win/src/restricted_token.cc b/sandbox/win/src/restricted_token.cc
index ea84d867ba622c4c9393783428aee6beb3a394ca..b696a24b5081b0694a23d383fb7a0f74b53744e4 100644
--- a/sandbox/win/src/restricted_token.cc
+++ b/sandbox/win/src/restricted_token.cc
@@ -6,10 +6,10 @@
#include <stddef.h>
+#include <memory>
#include <vector>
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "sandbox/win/src/acl.h"
#include "sandbox/win/src/win_utils.h"
@@ -17,9 +17,9 @@ namespace {
// Calls GetTokenInformation with the desired |info_class| and returns a buffer
// with the result.
-scoped_ptr<BYTE[]> GetTokenInfo(const base::win::ScopedHandle& token,
- TOKEN_INFORMATION_CLASS info_class,
- DWORD* error) {
+std::unique_ptr<BYTE[]> GetTokenInfo(const base::win::ScopedHandle& token,
+ TOKEN_INFORMATION_CLASS info_class,
+ DWORD* error) {
// Get the required buffer size.
DWORD size = 0;
::GetTokenInformation(token.Get(), info_class, NULL, 0, &size);
@@ -28,7 +28,7 @@ scoped_ptr<BYTE[]> GetTokenInfo(const base::win::ScopedHandle& token,
return nullptr;
}
- scoped_ptr<BYTE[]> buffer(new BYTE[size]);
+ std::unique_ptr<BYTE[]> buffer(new BYTE[size]);
if (!::GetTokenInformation(token.Get(), info_class, buffer.get(), size,
&size)) {
*error = ::GetLastError();
@@ -227,7 +227,7 @@ DWORD RestrictedToken::AddAllSidsForDenyOnly(std::vector<Sid> *exceptions) {
return ERROR_NO_TOKEN;
DWORD error;
- scoped_ptr<BYTE[]> buffer =
+ std::unique_ptr<BYTE[]> buffer =
GetTokenInfo(effective_token_, TokenGroups, &error);
if (!buffer)
@@ -274,7 +274,7 @@ DWORD RestrictedToken::AddUserSidForDenyOnly() {
return ERROR_NO_TOKEN;
DWORD size = sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE;
- scoped_ptr<BYTE[]> buffer(new BYTE[size]);
+ std::unique_ptr<BYTE[]> buffer(new BYTE[size]);
TOKEN_USER* token_user = reinterpret_cast<TOKEN_USER*>(buffer.get());
BOOL result = ::GetTokenInformation(effective_token_.Get(), TokenUser,
@@ -296,7 +296,7 @@ DWORD RestrictedToken::DeleteAllPrivileges(
return ERROR_NO_TOKEN;
DWORD error;
- scoped_ptr<BYTE[]> buffer =
+ std::unique_ptr<BYTE[]> buffer =
GetTokenInfo(effective_token_, TokenPrivileges, &error);
if (!buffer)
@@ -356,7 +356,7 @@ DWORD RestrictedToken::AddRestrictingSidLogonSession() {
return ERROR_NO_TOKEN;
DWORD error;
- scoped_ptr<BYTE[]> buffer =
+ std::unique_ptr<BYTE[]> buffer =
GetTokenInfo(effective_token_, TokenGroups, &error);
if (!buffer)
@@ -384,7 +384,7 @@ DWORD RestrictedToken::AddRestrictingSidCurrentUser() {
return ERROR_NO_TOKEN;
DWORD size = sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE;
- scoped_ptr<BYTE[]> buffer(new BYTE[size]);
+ std::unique_ptr<BYTE[]> buffer(new BYTE[size]);
TOKEN_USER* token_user = reinterpret_cast<TOKEN_USER*>(buffer.get());
BOOL result = ::GetTokenInformation(effective_token_.Get(), TokenUser,
@@ -409,7 +409,7 @@ DWORD RestrictedToken::AddRestrictingSidAllSids() {
if (ERROR_SUCCESS != error)
return error;
- scoped_ptr<BYTE[]> buffer =
+ std::unique_ptr<BYTE[]> buffer =
GetTokenInfo(effective_token_, TokenGroups, &error);
if (!buffer)
« no previous file with comments | « sandbox/win/src/process_thread_policy.cc ('k') | sandbox/win/src/sandbox_policy_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698