summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-17 19:12:21 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-17 19:12:21 +0000
commitafabb46f1e9eaf7f7109e029bc011c57e1960f7e (patch)
treed9934cc63f0c7d3e9017ef3a5cb75fd2994f2785 /content
parent98d95d88e2fe727487e20dd516a09b935bae215b (diff)
downloadchromium_src-afabb46f1e9eaf7f7109e029bc011c57e1960f7e.zip
chromium_src-afabb46f1e9eaf7f7109e029bc011c57e1960f7e.tar.gz
chromium_src-afabb46f1e9eaf7f7109e029bc011c57e1960f7e.tar.bz2
Fix the test for Windows.
With this fix, the reverted CL 173259 can land. On windows we won't update GPUInfo's GL strings when ANGLE is used. So in order to trigger the update, the GL_VENDOR string should not be empty. BUG= TEST= TBR=kbr Review URL: https://codereview.chromium.org/11570049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/gpu_data_manager_impl_unittest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl_unittest.cc b/content/browser/gpu/gpu_data_manager_impl_unittest.cc
index 159cf58..c3634678 100644
--- a/content/browser/gpu/gpu_data_manager_impl_unittest.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_unittest.cc
@@ -142,6 +142,7 @@ TEST_F(GpuDataManagerImplTest, GpuSideBlacklisting) {
EXPECT_TRUE(manager->GpuAccessAllowed());
EXPECT_EQ(GPU_FEATURE_TYPE_WEBGL, manager->GetBlacklistedFeatures());
+ gpu_info.gl_vendor = "NVIDIA";
gpu_info.gl_renderer = "NVIDIA GeForce GT 120";
manager->UpdateGpuInfo(gpu_info);
EXPECT_FALSE(manager->GpuAccessAllowed());