Add win8.1 support to GPUBotConfig

gpu/config/gpu_test_config.cc

 // 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 "gpu/config/gpu_test_config.h"
 
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_info_collector.h"
@@ skipping 19 matching lines @@
   int32 minor_version = 0;
   int32 bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(
       &major_version, &minor_version, &bugfix_version);
   if (major_version == 5)
     return GPUTestConfig::kOsWinXP;
   if (major_version == 6 && minor_version == 0)
     return GPUTestConfig::kOsWinVista;
   if (major_version == 6 && minor_version == 1)
     return GPUTestConfig::kOsWin7;
-  if (major_version == 6 && minor_version == 2)
+  if (major_version == 6 && (minor_version == 2 || minor_version == 3))
     return GPUTestConfig::kOsWin8;

[Ken Russell (switch to Gerrit), 2014/05/23 02:37:58]

We might need to add a win81 or win8_1 configuration at some point.

 #elif defined(OS_MACOSX)
   int32 major_version = 0;
   int32 minor_version = 0;
   int32 bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(
       &major_version, &minor_version, &bugfix_version);
   if (major_version == 10) {
     switch (minor_version) {
       case 5:
         return GPUTestConfig::kOsMacLeopard;
@@ skipping 178 matching lines @@
 }
 
 bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
   bool rt;
   if (gpu_info == NULL) {
     GPUInfo my_gpu_info;
     GpuIDResult result;
     result = CollectGpuID(&my_gpu_info.gpu.vendor_id,
                           &my_gpu_info.gpu.device_id);
     if (result == kGpuIDNotSupported) {
+      LOG(ERROR) << "Fail to identify GPU";
       DisableGPUInfoValidation();
       rt = true;
     } else {
       rt = SetGPUInfo(my_gpu_info);
     }
   } else {
     rt = SetGPUInfo(*gpu_info);
   }
   set_os(GetCurrentOS());
-  if (os() == kOsUnknown)
+  if (os() == kOsUnknown) {
+    LOG(ERROR) << "Unknown OS";
     rt = false;
+  }
 #if defined(NDEBUG)
   set_build_type(kBuildTypeRelease);
 #else
   set_build_type(kBuildTypeDebug);
 #endif
   return rt;
 }
 
 // static
 bool GPUTestBotConfig::CurrentConfigMatches(const std::string& config_data) {
@@ skipping 27 matching lines @@
   // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
   if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
     return true;
   }
 #endif
   return false;
 }
 
 }  // namespace gpu