| Index: content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
|
| 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 880a83fe77f85d13a6bc49778cb7ce6e6645addc..a5123c84251376bf94e7b335be4bf0168c992372 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl_private_unittest.cc
|
| @@ -595,7 +595,8 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStrings) {
|
| manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa801);
|
| EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
|
| EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
|
| - EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
|
| + EXPECT_TRUE(
|
| + manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
|
| }
|
|
|
| TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) {
|
| @@ -645,7 +646,8 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) {
|
| // Full GPUInfo, the entry applies.
|
| EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
|
| EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
|
| - EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
|
| + EXPECT_TRUE(
|
| + manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
|
|
|
| // Now assume browser gets GL strings from local state.
|
| // SetGLStrings() has no effects because GPUInfo already got these strings.
|
| @@ -653,7 +655,8 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsNoEffects) {
|
| manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa802);
|
| EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
|
| EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
|
| - EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
|
| + EXPECT_TRUE(
|
| + manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
|
| }
|
|
|
| TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsDefered) {
|
| @@ -690,7 +693,8 @@ TEST_F(GpuDataManagerImplPrivateTest, SetGLStringsDefered) {
|
|
|
| EXPECT_TRUE(manager->GpuAccessAllowed(NULL));
|
| EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
|
| - EXPECT_TRUE(manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_WEBGL));
|
| + EXPECT_TRUE(
|
| + manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_WEBGL));
|
| }
|
| #endif // OS_LINUX
|
|
|
|
|