Revert of Sandbox: Make CreateRestrictedToken return a ScopedHandle.

sandbox/win/src/restricted_token_unittest.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.
 
 // This file contains unit tests for the RestrictedToken.
 
 #define _ATL_NO_EXCEPTIONS
 #include <atlbase.h>
 #include <atlsecurity.h>
 #include <vector>
-
-#include "base/win/scoped_handle.h"
 #include "sandbox/win/src/restricted_token.h"
 #include "sandbox/win/src/sid.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
 // Tests the initializatioin with an invalid token handle.
 TEST(RestrictedTokenTest, InvalidHandle) {
   RestrictedToken token;
   ASSERT_EQ(ERROR_INVALID_HANDLE, token.Init(reinterpret_cast<HANDLE>(0x5555)));
@@ skipping 10 matching lines @@
 
   ATL::CAccessToken access_token;
   access_token.Attach(token_handle);
 
   // Create the token using the current token.
   RestrictedToken token_default;
   ASSERT_EQ(ERROR_SUCCESS, token_default.Init(NULL));
 
   // Get the handle to the restricted token.
 
-  base::win::ScopedHandle restricted_token_handle;
+  HANDLE restricted_token_handle = NULL;
   ASSERT_EQ(ERROR_SUCCESS,
-      token_default.GetRestrictedToken(&restricted_token_handle));
+      token_default.GetRestrictedTokenHandle(&restricted_token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(restricted_token_handle.Take());
+  restricted_token.Attach(restricted_token_handle);
 
   ATL::CSid sid_user_restricted;
   ATL::CSid sid_user_default;
   ATL::CSid sid_owner_restricted;
   ATL::CSid sid_owner_default;
   ASSERT_TRUE(restricted_token.GetUser(&sid_user_restricted));
   ASSERT_TRUE(access_token.GetUser(&sid_user_default));
   ASSERT_TRUE(restricted_token.GetOwner(&sid_owner_restricted));
   ASSERT_TRUE(access_token.GetOwner(&sid_owner_default));
 
@@ skipping 16 matching lines @@
 
   // Change the primary group.
   access_token.SetPrimaryGroup(ATL::Sids::World());
 
   // Create the token using the current token.
   RestrictedToken token;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle()));
 
   // Get the handle to the restricted token.
 
-  base::win::ScopedHandle restricted_token_handle;
+  HANDLE restricted_token_handle = NULL;
   ASSERT_EQ(ERROR_SUCCESS,
-      token.GetRestrictedToken(&restricted_token_handle));
+      token.GetRestrictedTokenHandle(&restricted_token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(restricted_token_handle.Take());
+  restricted_token.Attach(restricted_token_handle);
 
   ATL::CSid sid_restricted;
   ATL::CSid sid_default;
   ASSERT_TRUE(restricted_token.GetPrimaryGroup(&sid_restricted));
   ASSERT_TRUE(access_token.GetPrimaryGroup(&sid_default));
 
   // Check if both token have the same owner.
   ASSERT_EQ(sid_restricted, sid_default);
 }
 
 // Verifies that the token created by the object are valid.
 TEST(RestrictedTokenTest, ResultToken) {
   RestrictedToken token;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
 
   ASSERT_EQ(ERROR_SUCCESS,
             token.AddRestrictingSid(ATL::Sids::World().GetPSID()));
 
-  base::win::ScopedHandle restricted_token;
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&restricted_token));
+  HANDLE restricted_token;
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&restricted_token));
 
-  ASSERT_TRUE(::IsTokenRestricted(restricted_token.Get()));
+  ASSERT_TRUE(::IsTokenRestricted(restricted_token));
 
   DWORD length = 0;
   TOKEN_TYPE type;
-  ASSERT_TRUE(::GetTokenInformation(restricted_token.Get(),
+  ASSERT_TRUE(::GetTokenInformation(restricted_token,
                                     ::TokenType,
                                     &type,
                                     sizeof(type),
                                     &length));
 
   ASSERT_EQ(type, TokenPrimary);
 
-  base::win::ScopedHandle impersonation_token;
+  HANDLE impersonation_token;
   ASSERT_EQ(ERROR_SUCCESS,
-      token.GetRestrictedTokenForImpersonation(&impersonation_token));
+      token.GetRestrictedTokenHandleForImpersonation(&impersonation_token));
 
-  ASSERT_TRUE(::IsTokenRestricted(impersonation_token.Get()));
+  ASSERT_TRUE(::IsTokenRestricted(impersonation_token));
 
-  ASSERT_TRUE(::GetTokenInformation(impersonation_token.Get(),
+  ASSERT_TRUE(::GetTokenInformation(impersonation_token,
                                     ::TokenType,
                                     &type,
                                     sizeof(type),
                                     &length));
 
   ASSERT_EQ(type, TokenImpersonation);
+
+  ::CloseHandle(impersonation_token);
+  ::CloseHandle(restricted_token);
 }
 
 // Verifies that the token created has "Restricted" in its default dacl.
 TEST(RestrictedTokenTest, DefaultDacl) {
   RestrictedToken token;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
 
   ASSERT_EQ(ERROR_SUCCESS,
             token.AddRestrictingSid(ATL::Sids::World().GetPSID()));
 
-  base::win::ScopedHandle handle;
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&handle));
+  HANDLE handle;
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(handle.Take());
+  restricted_token.Attach(handle);
 
   ATL::CDacl dacl;
   ASSERT_TRUE(restricted_token.GetDefaultDacl(&dacl));
 
   bool restricted_found = false;
 
   unsigned int ace_count = dacl.GetAceCount();
   for (unsigned int i = 0; i < ace_count ; ++i) {
     ATL::CSid sid;
     ACCESS_MASK mask = 0;
     dacl.GetAclEntry(i, &sid, &mask);
     if (sid == ATL::Sids::RestrictedCode() && mask == GENERIC_ALL) {
       restricted_found = true;
       break;
     }
   }
 
   ASSERT_TRUE(restricted_found);
 }
 
 // Tests the method "AddSidForDenyOnly".
 TEST(RestrictedTokenTest, DenySid) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddSidForDenyOnly(Sid(WinWorldSid)));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   for (unsigned int i = 0; i < sids.GetCount(); i++) {
     if (ATL::Sids::World() == sids[i]) {
       ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY,
                 attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
     }
   }
 }
 
 // Tests the method "AddAllSidsForDenyOnly".
 TEST(RestrictedTokenTest, DenySids) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddAllSidsForDenyOnly(NULL));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   // Verify that all sids are really gone.
   for (unsigned int i = 0; i < sids.GetCount(); i++) {
     if ((attributes[i] & SE_GROUP_LOGON_ID) == 0 &&
         (attributes[i] & SE_GROUP_INTEGRITY) == 0) {
       ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY,
                 attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
     }
   }
 }
 
 // Tests the method "AddAllSidsForDenyOnly" using an exception list.
 TEST(RestrictedTokenTest, DenySidsException) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   std::vector<Sid> sids_exception;
   sids_exception.push_back(Sid(WinWorldSid));
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddAllSidsForDenyOnly(&sids_exception));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   // Verify that all sids are really gone.
   for (unsigned int i = 0; i < sids.GetCount(); i++) {
     if ((attributes[i] & SE_GROUP_LOGON_ID) == 0 &&
         (attributes[i] & SE_GROUP_INTEGRITY) == 0) {
       if (ATL::Sids::World() == sids[i]) {
         ASSERT_EQ(NULL, attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
       } else {
         ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY,
                   attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
       }
     }
   }
 }
 
 // Tests test method AddOwnerSidForDenyOnly.
 TEST(RestrictedTokenTest, DenyOwnerSid) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddUserSidForDenyOnly());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   ATL::CSid user_sid;
   ASSERT_TRUE(restricted_token.GetUser(&user_sid));
 
   for (unsigned int i = 0; i < sids.GetCount(); ++i) {
     if (user_sid == sids[i]) {
       ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY,
                 attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
     }
   }
 }
 
 // Tests test method AddOwnerSidForDenyOnly with a custom effective token.
 TEST(RestrictedTokenTest, DenyOwnerSidCustom) {
   // Get the current process token.
-  HANDLE access_handle = INVALID_HANDLE_VALUE;
+  HANDLE token_handle = INVALID_HANDLE_VALUE;
   ASSERT_TRUE(::OpenProcessToken(::GetCurrentProcess(), TOKEN_ALL_ACCESS,
-                                 &access_handle));
+                                 &token_handle));
 
-  ASSERT_NE(INVALID_HANDLE_VALUE, access_handle);
+  ASSERT_NE(INVALID_HANDLE_VALUE, token_handle);
 
   ATL::CAccessToken access_token;
-  access_token.Attach(access_handle);
+  access_token.Attach(token_handle);
 
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle()));
   ASSERT_EQ(ERROR_SUCCESS, token.AddUserSidForDenyOnly());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   ATL::CSid user_sid;
   ASSERT_TRUE(restricted_token.GetUser(&user_sid));
 
   for (unsigned int i = 0; i < sids.GetCount(); ++i) {
     if (user_sid == sids[i]) {
       ASSERT_EQ(SE_GROUP_USE_FOR_DENY_ONLY,
                 attributes[i] & SE_GROUP_USE_FOR_DENY_ONLY);
     }
   }
 }
 
 // Tests the method DeleteAllPrivileges.
 TEST(RestrictedTokenTest, DeleteAllPrivileges) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.DeleteAllPrivileges(NULL));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenPrivileges privileges;
   ASSERT_TRUE(restricted_token.GetPrivileges(&privileges));
 
   ASSERT_EQ(0, privileges.GetCount());
 }
 
 // Tests the method DeleteAllPrivileges with an exception list.
 TEST(RestrictedTokenTest, DeleteAllPrivilegesException) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   std::vector<base::string16> exceptions;
   exceptions.push_back(SE_CHANGE_NOTIFY_NAME);
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.DeleteAllPrivileges(&exceptions));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenPrivileges privileges;
   ASSERT_TRUE(restricted_token.GetPrivileges(&privileges));
 
   ATL::CTokenPrivileges::CNames privilege_names;
   ATL::CTokenPrivileges::CAttributes privilege_name_attributes;
   privileges.GetNamesAndAttributes(&privilege_names,
                                    &privilege_name_attributes);
 
   ASSERT_EQ(1, privileges.GetCount());
 
   for (unsigned int i = 0; i < privileges.GetCount(); ++i) {
     ASSERT_EQ(privilege_names[i], SE_CHANGE_NOTIFY_NAME);
   }
 }
 
 // Tests the method DeletePrivilege.
 TEST(RestrictedTokenTest, DeletePrivilege) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.DeletePrivilege(SE_CHANGE_NOTIFY_NAME));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenPrivileges privileges;
   ASSERT_TRUE(restricted_token.GetPrivileges(&privileges));
 
   ATL::CTokenPrivileges::CNames privilege_names;
   ATL::CTokenPrivileges::CAttributes privilege_name_attributes;
   privileges.GetNamesAndAttributes(&privilege_names,
                                    &privilege_name_attributes);
 
   for (unsigned int i = 0; i < privileges.GetCount(); ++i) {
@@ skipping 32 matching lines @@
       break;
     }
   }
 
   ASSERT_TRUE(present);
 }
 
 // Tests the method AddRestrictingSid.
 TEST(RestrictedTokenTest, AddRestrictingSid) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS,
             token.AddRestrictingSid(ATL::Sids::World().GetPSID()));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   CheckRestrictingSid(restricted_token, ATL::Sids::World(), 1);
 }
 
 // Tests the method AddRestrictingSidCurrentUser.
 TEST(RestrictedTokenTest, AddRestrictingSidCurrentUser) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
   ATL::CSid user;
   restricted_token.GetUser(&user);
 
   CheckRestrictingSid(restricted_token, user, 1);
 }
 
 // Tests the method AddRestrictingSidCurrentUser with a custom effective token.
 TEST(RestrictedTokenTest, AddRestrictingSidCurrentUserCustom) {
   // Get the current process token.
-  HANDLE access_handle = INVALID_HANDLE_VALUE;
+  HANDLE token_handle = INVALID_HANDLE_VALUE;
   ASSERT_TRUE(::OpenProcessToken(::GetCurrentProcess(), TOKEN_ALL_ACCESS,
-                                 &access_handle));
+                                 &token_handle));
 
-  ASSERT_NE(INVALID_HANDLE_VALUE, access_handle);
+  ASSERT_NE(INVALID_HANDLE_VALUE, token_handle);
 
   ATL::CAccessToken access_token;
-  access_token.Attach(access_handle);
+  access_token.Attach(token_handle);
 
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(access_token.GetHandle()));
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
   ATL::CSid user;
   restricted_token.GetUser(&user);
 
   CheckRestrictingSid(restricted_token, user, 1);
 }
 
 // Tests the method AddRestrictingSidLogonSession.
 TEST(RestrictedTokenTest, AddRestrictingSidLogonSession) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidLogonSession());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
   ATL::CSid session;
   restricted_token.GetLogonSid(&session);
 
   CheckRestrictingSid(restricted_token, session, 1);
 }
 
 // Tests adding a lot of restricting sids.
 TEST(RestrictedTokenTest, AddMultipleRestrictingSids) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidCurrentUser());
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidLogonSession());
   ASSERT_EQ(ERROR_SUCCESS,
             token.AddRestrictingSid(ATL::Sids::World().GetPSID()));
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
   ATL::CSid session;
   restricted_token.GetLogonSid(&session);
 
   DWORD length = 8192;
   BYTE *memory = new BYTE[length];
   TOKEN_GROUPS *groups = reinterpret_cast<TOKEN_GROUPS*>(memory);
   ASSERT_TRUE(::GetTokenInformation(restricted_token.GetHandle(),
                                     TokenRestrictedSids,
                                     groups,
                                     length,
                                     &length));
 
   ATL::CTokenGroups atl_groups(*groups);
   delete[] memory;
 
   ASSERT_EQ(3, atl_groups.GetCount());
 }
 
 // Tests the method "AddRestrictingSidAllSids".
 TEST(RestrictedTokenTest, AddAllSidToRestrictingSids) {
   RestrictedToken token;
-  base::win::ScopedHandle token_handle;
+  HANDLE token_handle = NULL;
 
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
   ASSERT_EQ(ERROR_SUCCESS, token.AddRestrictingSidAllSids());
-  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedToken(&token_handle));
+  ASSERT_EQ(ERROR_SUCCESS, token.GetRestrictedTokenHandle(&token_handle));
 
   ATL::CAccessToken restricted_token;
-  restricted_token.Attach(token_handle.Take());
+  restricted_token.Attach(token_handle);
 
   ATL::CTokenGroups groups;
   ASSERT_TRUE(restricted_token.GetGroups(&groups));
 
   ATL::CSid::CSidArray sids;
   ATL::CAtlArray<DWORD> attributes;
   groups.GetSidsAndAttributes(&sids, &attributes);
 
   // Verify that all group sids are in the restricting sid list.
   for (unsigned int i = 0; i < sids.GetCount(); i++) {
@@ skipping 10 matching lines @@
 
 // Checks the error code when the object is initialized twice.
 TEST(RestrictedTokenTest, DoubleInit) {
   RestrictedToken token;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
 
   ASSERT_EQ(ERROR_ALREADY_INITIALIZED, token.Init(NULL));
 }
 
 }  // namespace sandbox