Lump client and server versions of Windows together.

base/win/windows_version.h

Index: base/win/windows_version.h
diff --git a/base/win/windows_version.h b/base/win/windows_version.h
index 1061b47a97383fb40b0e79e9a1ead6dc86f2ea85..20eb365905342d45b01cd832f9e69e9b80be7a63 100644
--- a/base/win/windows_version.h
+++ b/base/win/windows_version.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -19,14 +19,12 @@ namespace win {
 // 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,
-  VERSION_SERVER_2003,  // Also includes Windows XP Professional x64.
-  VERSION_VISTA,
-  VERSION_SERVER_2008,
-  VERSION_WIN7,
-  VERSION_WIN8,
-  VERSION_WIN_LAST,  // Indicates error condition.
+  VERSION_PRE_XP = 0,  // Not supported.
+  VERSION_XP,          // Also includes XP Pro x64, Server 2003, and S2003 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