summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 21:36:15 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-12 21:38:33 +0000
commit220698aaf8077d85505d76a26f7fa0f909b83b58 (patch)
treefb3b079e4fb8dcfa66d4d5807c84abd0bf2d7adb /content
parent22d40e2a6ce678247af3479ec0861b643dcae711 (diff)
downloadchromium_src-220698aaf8077d85505d76a26f7fa0f909b83b58.zip
chromium_src-220698aaf8077d85505d76a26f7fa0f909b83b58.tar.gz
chromium_src-220698aaf8077d85505d76a26f7fa0f909b83b58.tar.bz2
Use RE string pattern matching for blacklist strings.
Including cpu_brand, gl_vendor, gl_renderer, gl_extension, driver_vendor, and machine_model_name. BUG=396578 TBR=piman@chromium.org TEST=gpu_unittests Review URL: https://codereview.chromium.org/452293002 Cr-Commit-Position: refs/heads/master@{#289067} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/gpu_data_manager_impl_private_unittest.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
index 8babf0e..41458ed 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
@@ -158,10 +158,7 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideBlacklisting) {
},
{
"id": 2,
- "gl_renderer": {
- "op": "contains",
- "value": "GeForce"
- },
+ "gl_renderer": ".*GeForce.*",
"features": [
"accelerated_2d_canvas"
]
@@ -205,10 +202,7 @@ TEST_F(GpuDataManagerImplPrivateTest, GpuSideExceptions) {
"id": 1,
"exceptions": [
{
- "gl_renderer": {
- "op": "contains",
- "value": "GeForce"
- }
+ "gl_renderer": ".*GeForce.*"
}
],
"features": [