Revert 80819 due to failed tests

sandbox/src/job.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "sandbox/src/job.h"
-
-#include "base/win/windows_version.h"
 #include "sandbox/src/restricted_token.h"
 
 namespace sandbox {
 
 Job::~Job() {
   if (job_handle_)
     ::CloseHandle(job_handle_);
 };
 
 DWORD Job::Init(JobLevel security_level, wchar_t *job_name,
@@ skipping 26 matching lines @@
       jbur.UIRestrictionsClass |= JOB_OBJECT_UILIMIT_DISPLAYSETTINGS;
       jeli.BasicLimitInformation.LimitFlags |= JOB_OBJECT_LIMIT_ACTIVE_PROCESS;
       jeli.BasicLimitInformation.ActiveProcessLimit = 1;
     }
     case JOB_INTERACTIVE: {
       jbur.UIRestrictionsClass |= JOB_OBJECT_UILIMIT_SYSTEMPARAMETERS;
       jbur.UIRestrictionsClass |= JOB_OBJECT_UILIMIT_DESKTOP;
       jbur.UIRestrictionsClass |= JOB_OBJECT_UILIMIT_EXITWINDOWS;
     }
     case JOB_UNPROTECTED: {
+      OSVERSIONINFO version_info = {0};
+      version_info.dwOSVersionInfoSize = sizeof(version_info);
+      GetVersionEx(&version_info);
+
       // The JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag is not supported on
       // Windows 2000. We need a mechanism on Windows 2000 to ensure
       // that processes in the job are terminated when the job is closed
-      if (base::win::GetVersion() == base::win::VERSION_PRE_XP)
+      if ((5 == version_info.dwMajorVersion) &&
+          (0 == version_info.dwMinorVersion)) {
         break;
+      }
 
       jeli.BasicLimitInformation.LimitFlags |=
           JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
       break;
     }
     default: {
       return ERROR_BAD_ARGUMENTS;
     }
   }
 
@@ skipping 38 matching lines @@
   if (!job_handle_)
     return ERROR_NO_DATA;
 
   if (FALSE == ::AssignProcessToJobObject(job_handle_, process_handle))
     return ::GetLastError();
 
   return ERROR_SUCCESS;
 }
 
 }  // namespace sandbox