Revert 48186, 48196, 48198

sandbox/src/restricted_token_unittest.cc

 // Copyright (c) 2006-2008 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 "sandbox/src/restricted_token.h"
 #include "sandbox/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)));
 }
 
 // Tests the initialization with NULL as parameter.
 TEST(RestrictedTokenTest, DefaultInit) {
   // Get the current process token.
-  HANDLE token_handle = INVALID_HANDLE_VALUE;
+  HANDLE token_handle = NULL;
   ASSERT_TRUE(::OpenProcessToken(::GetCurrentProcess(), TOKEN_ALL_ACCESS,
                                  &token_handle));
 
-  ASSERT_NE(INVALID_HANDLE_VALUE, token_handle);
+  ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(token_handle));
 
   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.
 
@@ skipping 14 matching lines @@
   ASSERT_TRUE(access_token.GetOwner(&sid_owner_default));
 
   // Check if both token have the same owner and user.
   ASSERT_EQ(sid_user_restricted, sid_user_default);
   ASSERT_EQ(sid_owner_restricted, sid_owner_default);
 }
 
 // Tests the initialization with a custom token as parameter.
 TEST(RestrictedTokenTest, CustomInit) {
   // Get the current process token.
-  HANDLE token_handle = INVALID_HANDLE_VALUE;
+  HANDLE token_handle = NULL;
   ASSERT_TRUE(::OpenProcessToken(::GetCurrentProcess(), TOKEN_ALL_ACCESS,
                                  &token_handle));
 
-  ASSERT_NE(INVALID_HANDLE_VALUE, token_handle);
+  ASSERT_NE(NULL, reinterpret_cast<ULONG_PTR>(token_handle));
 
   ATL::CAccessToken access_token;
   access_token.Attach(token_handle);
 
   // 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()));
@@ skipping 441 matching lines @@
 TEST(RestrictedTokenTest, DoubleInit) {
   RestrictedToken token;
   ASSERT_EQ(ERROR_SUCCESS, token.Init(NULL));
 
   ASSERT_EQ(ERROR_ALREADY_INITIALIZED, token.Init(NULL));
 }
 
 #endif
 
 }  // namespace sandbox