| Index: gpu/config/gpu_test_config.cc
|
| diff --git a/gpu/config/gpu_test_config.cc b/gpu/config/gpu_test_config.cc
|
| index 3b0b37c3c7332aab19d488dda249c4ee94f7ddc9..5f0c7ad2b0e12af179304d762f95dcf9a37fd698 100644
|
| --- a/gpu/config/gpu_test_config.cc
|
| +++ b/gpu/config/gpu_test_config.cc
|
| @@ -13,9 +13,7 @@
|
| #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)
|
| +#if defined(OS_WIN)
|
| #include "base/win/windows_version.h"
|
| #endif
|
|
|
| @@ -302,12 +300,7 @@ bool GPUTestBotConfig::CurrentConfigMatches(
|
|
|
| // 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)
|
| +#if defined(OS_WIN)
|
| // Blacklist rule #79 disables all Gpu acceleration before Windows 7.
|
| if (base::win::GetVersion() <= base::win::VERSION_VISTA) {
|
| return true;
|
|
|