Add Windows 10 support to GPU config parser.

BUG=508746
TEST=gpu_unittests

Review URL: https://codereview.chromium.org/1246203003

Cr-Commit-Position: refs/heads/master@{#339832}

gpu/config/gpu_test_config.cc

@@ -39,6 +39,8 @@ GPUTestConfig::OS GetCurrentOS() {
     return GPUTestConfig::kOsWin7;
   if (major_version == 6 && (minor_version == 2 || minor_version == 3))
     return GPUTestConfig::kOsWin8;
+  if (major_version == 10)
+    return GPUTestConfig::kOsWin10;
 #elif defined(OS_MACOSX)
   int32 major_version = 0;
   int32 minor_version = 0;
@@ -169,6 +171,7 @@ bool GPUTestBotConfig::IsValid() const {
     case kOsWinVista:
     case kOsWin7:
     case kOsWin8:
+    case kOsWin10:
     case kOsMacLeopard:
     case kOsMacSnowLeopard:
     case kOsMacLion:

gpu/config/gpu_test_config.h

@@ -24,7 +24,6 @@ class GPU_EXPORT GPUTestConfig {
     kOsWinVista = 1 << 1,
     kOsWin7 = 1 << 2,
     kOsWin8 = 1 << 3,
-    kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8,
     kOsMacLeopard = 1 << 4,
     kOsMacSnowLeopard = 1 << 5,
     kOsMacLion = 1 << 6,
@@ -36,6 +35,8 @@ class GPU_EXPORT GPUTestConfig {
     kOsLinux = 1 << 10,
     kOsChromeOS = 1 << 11,
     kOsAndroid = 1 << 12,
+    kOsWin10 = 1 << 13,
+    kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10,
   };
 
   enum BuildType {

gpu/config/gpu_test_expectations_parser.cc

@@ -31,6 +31,7 @@ enum Token {
   kConfigWinVista,
   kConfigWin7,
   kConfigWin8,
+  kConfigWin10,
   kConfigWin,
   kConfigMacLeopard,
   kConfigMacSnowLeopard,
@@ -78,6 +79,7 @@ const TokenInfo kTokenData[] = {
   { "vista", GPUTestConfig::kOsWinVista },
   { "win7", GPUTestConfig::kOsWin7 },
   { "win8", GPUTestConfig::kOsWin8 },
+  { "win10", GPUTestConfig::kOsWin10 },
   { "win", GPUTestConfig::kOsWin },
   { "leopard", GPUTestConfig::kOsMacLeopard },
   { "snowleopard", GPUTestConfig::kOsMacSnowLeopard },
@@ -231,6 +233,7 @@ bool GPUTestExpectationsParser::ParseConfig(
       case kConfigWinVista:
       case kConfigWin7:
       case kConfigWin8:
+      case kConfigWin10:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
@@ -283,6 +286,7 @@ bool GPUTestExpectationsParser::ParseLine(
       case kConfigWinVista:
       case kConfigWin7:
       case kConfigWin8:
+      case kConfigWin10:
       case kConfigWin:
       case kConfigMacLeopard:
       case kConfigMacSnowLeopard:
@@ -398,6 +402,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
     case kConfigWinVista:
     case kConfigWin7:
     case kConfigWin8:
+    case kConfigWin10:
     case kConfigWin:
     case kConfigMacLeopard:
     case kConfigMacSnowLeopard:

gpu/config/gpu_test_expectations_parser_unittest.cc

@@ -26,6 +26,7 @@ static const struct TestOsWithFamily {
   { { "VISTA", GPUTestConfig::kOsWinVista }, kOsFamilyWin },
   { { "WIN7", GPUTestConfig::kOsWin7 }, kOsFamilyWin },
   { { "WIN8", GPUTestConfig::kOsWin8 }, kOsFamilyWin },
+  { { "WIN10", GPUTestConfig::kOsWin10 }, kOsFamilyWin },
   { { "LEOPARD", GPUTestConfig::kOsMacLeopard }, kOsFamilyMac },
   { { "SNOWLEOPARD", GPUTestConfig::kOsMacSnowLeopard }, kOsFamilyMac },
   { { "LION", GPUTestConfig::kOsMacLion }, kOsFamilyMac },
@@ -165,7 +166,7 @@ TEST_F(GPUTestExpectationsParserTest, ValidUnrelatedTestEntry) {
 
 TEST_F(GPUTestExpectationsParserTest, AllModifiers) {
   const std::string text =
-      "BUG12345 XP VISTA WIN7 WIN8 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
+      "BUG12345 XP VISTA WIN7 WIN8 WIN10 LEOPARD SNOWLEOPARD LION MOUNTAINLION "
       "MAVERICKS LINUX CHROMEOS ANDROID "
       "NVIDIA INTEL AMD VMWARE RELEASE DEBUG : MyTest = "
       "PASS FAIL FLAKY TIMEOUT SKIP";
@@ -194,8 +195,8 @@ TEST_P(GPUTestExpectationsParserParamTest, DuplicateModifiers) {
 
 TEST_F(GPUTestExpectationsParserTest, AllModifiersLowerCase) {
   const std::string text =
-      "BUG12345 xp vista win7 leopard snowleopard lion linux chromeos android "
-      "nvidia intel amd vmware release debug : MyTest = "
+      "BUG12345 xp vista win7 win8 win10 leopard snowleopard lion linux "
+      "chromeos android nvidia intel amd vmware release debug : MyTest = "
       "pass fail flaky timeout skip";
 
   GPUTestExpectationsParser parser;