Lump client and server versions of Windows together.

base/win/windows_version.cc

-// 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.
 
 #include "base/win/windows_version.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 
 namespace base {
@@ skipping 20 matching lines @@
       architecture_(OTHER_ARCHITECTURE),
       wow64_status_(GetWOW64StatusForProcess(GetCurrentProcess())) {
   OSVERSIONINFOEX version_info = { sizeof version_info };
   GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&version_info));
   version_number_.major = version_info.dwMajorVersion;
   version_number_.minor = version_info.dwMinorVersion;
   version_number_.build = version_info.dwBuildNumber;
   if ((version_number_.major == 5) && (version_number_.minor > 0)) {
     version_ = (version_number_.minor == 1) ? VERSION_XP : VERSION_SERVER_2003;
   } else if (version_number_.major == 6) {
-    if (version_info.wProductType == VER_NT_WORKSTATION) {
-      switch (version_number_.minor) {
-        case 0:
-          version_ = VERSION_VISTA;
-          break;
-        case 1:
-          version_ = VERSION_WIN7;
-          break;
-        default:  // case 2 appears to be win8.
-          version_ = VERSION_WIN8;
-      }
-    } else {
-      version_ = VERSION_SERVER_2008;
+    switch (version_number_.minor) {
+      case 0:
+        version_ = (version_info.wProductType == VER_NT_WORKSTATION) ?
+            VERSION_VISTA : VERSION_SERVER_2008;
+        break;

[cpu_(ooo_6.6-7.5), 2012/05/23 18:21:08]

is server 2008 also vista? I mean, if we are folding the server versions we
might as well fold them all.

[grt (UTC plus 2), 2012/05/23 21:43:49]

Sure, why not.  Is it reasonable to lump all of these in with VERSION_XP:

XP Professional x64 Edition, Home Server, Server 2003, Server 2003 R2

+      case 1:
+        // Treat Windows Server 2008 R2 the same as Windows 7.
+        version_ = VERSION_WIN7;
+        break;
+      default:  // case 2 appears to be win8.
+        DCHECK_EQ(version_number_.minor, 2);

[cpu_(ooo_6.6-7.5), 2012/05/23 18:21:08]

I rather have case 2: and a dcheck on the default:

[grt (UTC plus 2), 2012/05/23 21:43:49]

But then when Windows 9 comes out, version_ will be VERSION_PRE_XP until someone
gets around to updating the code.  The way I have it, version_ will have what is
likely a more sane value to start with.

+        // Treat Windows Server 2012 the same as Windows 8.
+        version_ = VERSION_WIN8;
+        break;
     }
   } else if (version_number_.major > 6) {
     NOTREACHED();
     version_ = VERSION_WIN_LAST;
   }
   service_pack_.major = version_info.wServicePackMajor;
   service_pack_.minor = version_info.wServicePackMinor;
 
   SYSTEM_INFO system_info = { 0 };
   GetNativeSystemInfo(&system_info);
@@ skipping 21 matching lines @@
     return WOW64_UNKNOWN;
   return is_wow64 ? WOW64_ENABLED : WOW64_DISABLED;
 }
 
 Version GetVersion() {
   return OSInfo::GetInstance()->version();
 }
 
 }  // namespace win
 }  // namespace base