aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc')
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
new file mode 100644
index 000000000000..b6b427da9ab6
--- /dev/null
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
@@ -0,0 +1,12 @@
+--- gpu/config/gpu_control_list_unittest.cc.orig 2016-05-11 19:02:23 UTC
++++ gpu/config/gpu_control_list_unittest.cc
+@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs
+ features = control_list->MakeDecision(
+ GpuControlList::kOsLinux, kOsVersion, gpu_info());
+ EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+- defined(OS_OPENBSD)
++#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
+ // ControlList entries will be filtered to the current OS only upon loading.
+ EXPECT_TRUE(control_list->LoadList(
+ vendor_json, GpuControlList::kCurrentOsOnly));