Revert 243714 "Update GPU feature tests to expect no GPU on Wind..."

trunk/src/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"
 #include "gpu/config/gpu_test_expectations_parser.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
-#elif defined(OS_WIN)
-#include "base/win/windows_version.h"
 #endif
 
 namespace gpu {
 
 namespace {
 
 GPUTestConfig::OS GetCurrentOS() {
 #if defined(OS_CHROMEOS)
   return GPUTestConfig::kOsChromeOS;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
@@ skipping 247 matching lines @@
   return false;
 }
 
 // static
 bool GPUTestBotConfig::GpuBlacklistedOnBot() {
 #if defined(OS_MACOSX)
   // Blacklist rule #81 disables all Gpu acceleration on Mac < 10.8 bots.
   if (CurrentConfigMatches("MAC VMWARE") && base::mac::IsOSLionOrEarlier()) {
     return true;
   }
-#elif defined(OS_WIN)
-  // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
-  if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
-    return false;
-  }
 #endif
+  // TODO(ccameron): This should be true on Windows XP as well.
   return false;
 }
 
 }  // namespace gpu