Move windows version-related stuff out of base/win_util and into base/win/win...

sandbox/src/restricted_token_utils.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 <aclapi.h>
 #include <sddl.h>
 #include <vector>
 
 #include "sandbox/src/restricted_token_utils.h"
 
 #include "base/logging.h"
 #include "base/scoped_handle_win.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "sandbox/src/job.h"
 #include "sandbox/src/restricted_token.h"
 #include "sandbox/src/security_level.h"
 #include "sandbox/src/sid.h"
 
 namespace sandbox {
 
 DWORD CreateRestrictedToken(HANDLE *token_handle,
                             TokenLevel security_level,
                             IntegrityLevel integrity_level,
@@ skipping 54 matching lines @@
       privilege_exceptions.push_back(SE_CHANGE_NOTIFY_NAME);
       restricted_token.AddRestrictingSid(WinBuiltinUsersSid);
       restricted_token.AddRestrictingSid(WinWorldSid);
       restricted_token.AddRestrictingSid(WinRestrictedCodeSid);
 
       // This token has to be able to create objects in BNO.
       // Unfortunately, on vista, it needs the current logon sid
       // in the token to achieve this. You should also set the process to be
       // low integrity level so it can't access object created by other
       // processes.
-      if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+      if (base::win::GetVersion() >= base::win::VERSION_VISTA)
         restricted_token.AddRestrictingSidLogonSession();
-      }
       break;
     }
     case USER_RESTRICTED: {
       privilege_exceptions.push_back(SE_CHANGE_NOTIFY_NAME);
       restricted_token.AddUserSidForDenyOnly();
       restricted_token.AddRestrictingSid(WinRestrictedCodeSid);
       break;
     }
     case USER_LOCKDOWN: {
       restricted_token.AddUserSidForDenyOnly();
@@ skipping 178 matching lines @@
     case INTEGRITY_LEVEL_BELOW_LOW:
       return L"S-1-16-2048";
     case INTEGRITY_LEVEL_LAST:
       return NULL;
   }
 
   NOTREACHED();
   return NULL;
 }
 DWORD SetTokenIntegrityLevel(HANDLE token, IntegrityLevel integrity_level) {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return ERROR_SUCCESS;
 
   const wchar_t* integrity_level_str = GetIntegrityLevelString(integrity_level);
   if (!integrity_level_str) {
     // No mandatory level specified, we don't change it.
     return ERROR_SUCCESS;
   }
 
   PSID integrity_sid = NULL;
   if (!::ConvertStringSidToSid(integrity_level_str, &integrity_sid))
     return ::GetLastError();
 
   TOKEN_MANDATORY_LABEL label = {0};
   label.Label.Attributes = SE_GROUP_INTEGRITY;
   label.Label.Sid = integrity_sid;
 
   DWORD size = sizeof(TOKEN_MANDATORY_LABEL) + ::GetLengthSid(integrity_sid);
   BOOL result = ::SetTokenInformation(token, TokenIntegrityLevel, &label,
                                       size);
   ::LocalFree(integrity_sid);
 
   return result ? ERROR_SUCCESS : ::GetLastError();
 }
 
 DWORD SetProcessIntegrityLevel(IntegrityLevel integrity_level) {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return ERROR_SUCCESS;
 
   const wchar_t* integrity_level_str = GetIntegrityLevelString(integrity_level);
   if (!integrity_level_str) {
     // No mandatory level specified, we don't change it.
     return ERROR_SUCCESS;
   }
 
   // Before we can change the token, we need to change the security label on the
   // process so it is still possible to open the process with the new token.
@@ skipping 10 matching lines @@
                           &token_handle))
     return ::GetLastError();
 
   ScopedHandle token(token_handle);
 
   return SetTokenIntegrityLevel(token.Get(), integrity_level);
 }
 
 
 }  // namespace sandbox