Add Enterprise and Education Windows version types.

BUG=756976

Change-Id: I37050ae2c933ef7b75f22cba94a31a83f35f4215
Reviewed-on: https://chromium-review.googlesource.com/626380Reviewed-by: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Marc-André Decoste <mad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496456}

base/win/windows_version.cc

@@ -180,9 +180,24 @@ OSInfo::OSInfo()
         break;
       case PRODUCT_PROFESSIONAL:
       case PRODUCT_ULTIMATE:
+        version_type_ = SUITE_PROFESSIONAL;
+        break;
       case PRODUCT_ENTERPRISE:
+      case PRODUCT_ENTERPRISE_E:
+      case PRODUCT_ENTERPRISE_EVALUATION:
+      case PRODUCT_ENTERPRISE_N:
+      case PRODUCT_ENTERPRISE_N_EVALUATION:
+      case PRODUCT_ENTERPRISE_S:
+      case PRODUCT_ENTERPRISE_S_EVALUATION:
+      case PRODUCT_ENTERPRISE_S_N:
+      case PRODUCT_ENTERPRISE_S_N_EVALUATION:
       case PRODUCT_BUSINESS:
-        version_type_ = SUITE_PROFESSIONAL;
+      case PRODUCT_BUSINESS_N:
+        version_type_ = SUITE_ENTERPRISE;
+        break;
+      case PRODUCT_EDUCATION:
+      case PRODUCT_EDUCATION_N:
+        version_type_ = SUITE_EDUCATION;
         break;
       case PRODUCT_HOME_BASIC:
       case PRODUCT_HOME_PREMIUM:

base/win/windows_version.h

@@ -41,11 +41,14 @@ enum Version {
 
 // A rough bucketing of the available types of versions of Windows. This is used
 // to distinguish enterprise enabled versions from home versions and potentially
-// server versions.
+// server versions. Keep these values in the same order, since they are used as
+// is for metrics histogram ids.
 enum VersionType {
-  SUITE_HOME,
+  SUITE_HOME = 0,
   SUITE_PROFESSIONAL,
   SUITE_SERVER,
+  SUITE_ENTERPRISE,
+  SUITE_EDUCATION,
   SUITE_LAST,
 };