Cleanup/Remove Windows XP/Vista version checks from Windows sandbox code

sandbox/win/src/target_services.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/target_services.h"
 
 #include <new>
 
 #include <process.h>
 #include <stdint.h>
@@ skipping 58 matching lines @@
 // This needs to happen after RevertToSelf() is called, because (at least) in
 // the case of GetUserDefaultLCID() it checks the TEB to see if the process is
 // impersonating (TEB!IsImpersonating). If it is, the cached locale information
 // is not used, nor is it set. Therefore, calls after RevertToSelf() will not
 // have warmed-up values to use.
 bool WarmupWindowsLocales() {
   // NOTE(liamjm): When last checked (Win 8.1 x64) it wasn't necessary to
   // warmup all of these functions, but let's not assume that.
   ::GetUserDefaultLangID();
   ::GetUserDefaultLCID();
-  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
-    static GetUserDefaultLocaleNameFunction GetUserDefaultLocaleName_func =
-        NULL;
+  static GetUserDefaultLocaleNameFunction GetUserDefaultLocaleName_func =
+      NULL;
+  if (!GetUserDefaultLocaleName_func) {
+    HMODULE kernel32_dll = ::GetModuleHandle(kKernel32DllName);
+    if (!kernel32_dll) {
+      return false;
+    }
+    GetUserDefaultLocaleName_func =
+        reinterpret_cast<GetUserDefaultLocaleNameFunction>(
+            GetProcAddress(kernel32_dll, "GetUserDefaultLocaleName"));
     if (!GetUserDefaultLocaleName_func) {
-      HMODULE kernel32_dll = ::GetModuleHandle(kKernel32DllName);
-      if (!kernel32_dll) {
-        return false;
-      }
-      GetUserDefaultLocaleName_func =
-          reinterpret_cast<GetUserDefaultLocaleNameFunction>(
-              GetProcAddress(kernel32_dll, "GetUserDefaultLocaleName"));
-      if (!GetUserDefaultLocaleName_func) {
-        return false;
-      }
+      return false;
     }
-    wchar_t localeName[LOCALE_NAME_MAX_LENGTH] = {0};
-    return (0 != GetUserDefaultLocaleName_func(
-                     localeName, LOCALE_NAME_MAX_LENGTH * sizeof(wchar_t)));
   }
-  return true;
+  wchar_t localeName[LOCALE_NAME_MAX_LENGTH] = {0};
+  return (0 != GetUserDefaultLocaleName_func(
+                    localeName, LOCALE_NAME_MAX_LENGTH * sizeof(wchar_t)));
 }
 
 // Used as storage for g_target_services, because other allocation facilities
 // are not available early. We can't use a regular function static because on
 // VS2015, because the CRT tries to acquire a lock to guard initialization, but
 // this code runs before the CRT is initialized.
 char g_target_services_memory[sizeof(sandbox::TargetServicesBase)];
 sandbox::TargetServicesBase* g_target_services = nullptr;
 
 }  // namespace
@@ skipping 143 matching lines @@
 ResultCode TargetServicesBase::DuplicateHandle(HANDLE source_handle,
                                                DWORD target_process_id,
                                                HANDLE* target_handle,
                                                DWORD desired_access,
                                                DWORD options) {
   return sandbox::DuplicateHandleProxy(source_handle, target_process_id,
                                        target_handle, desired_access, options);
 }
 
 }  // namespace sandbox