Merge 146054 - Bring back VERSION_SERVER_2003 to distinguish Server 2003 and XP Pro x64 from regula…

base/win/windows_version.h

 // 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.
 
 #ifndef BASE_WIN_WINDOWS_VERSION_H_
 #define BASE_WIN_WINDOWS_VERSION_H_
 #pragma once
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
 
 typedef void* HANDLE;
 
 namespace base {
 namespace win {
 
 // The running version of Windows.  This is declared outside OSInfo for
 // syntactic sugar reasons; see the declaration of GetVersion() below.
 // NOTE: Keep these in order so callers can do things like
 // "if (base::win::GetVersion() >= base::win::VERSION_VISTA) ...".
 enum Version {
   VERSION_PRE_XP = 0,  // Not supported.
-  VERSION_XP,          // Also includes XP Pro x64, Server 2003, and S2003 R2.
+  VERSION_XP,
+  VERSION_SERVER_2003, // Also includes XP Pro x64 and Server 2003 R2.
   VERSION_VISTA,       // Also includes Windows Server 2008.
   VERSION_WIN7,        // Also includes Windows Server 2008 R2.
   VERSION_WIN8,        // Also includes Windows Server 2012.
   VERSION_WIN_LAST,    // Indicates error condition.
 };
 
 // A singleton that can be used to query various pieces of information about the
 // OS and process state. Note that this doesn't use the base Singleton class, so
 // it can be used without an AtExitManager.
 class BASE_EXPORT OSInfo {
@@ skipping 63 matching lines @@
 };
 
 // Because this is by far the most commonly-requested value from the above
 // singleton, we add a global-scope accessor here as syntactic sugar.
 BASE_EXPORT Version GetVersion();
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_WINDOWS_VERSION_H_