| Index: gpu/command_buffer/service/feature_info_unittest.cc
|
| diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
|
| index 4c392dd82d002d8d81caee48e9e617eab2b848cb..c4906a33dfbd55808e654fb7a3391ddcef11a759 100644
|
| --- a/gpu/command_buffer/service/feature_info_unittest.cc
|
| +++ b/gpu/command_buffer/service/feature_info_unittest.cc
|
| @@ -1307,18 +1307,8 @@ TEST_P(FeatureInfoTest, BlendEquationAdvancedDisabled) {
|
| EXPECT_FALSE(info_->feature_flags().blend_equation_advanced_coherent);
|
| }
|
|
|
| -TEST_P(FeatureInfoTest, InitializeCHROMIUM_path_rendering_no_cmdline_switch) {
|
| - SetupInitExpectationsWithGLVersion(
|
| - "GL_ARB_compatibility GL_NV_path_rendering GL_EXT_direct_state_access",
|
| - "", "4.3");
|
| - EXPECT_FALSE(info_->feature_flags().chromium_path_rendering);
|
| - EXPECT_THAT(info_->extensions(),
|
| - Not(HasSubstr("GL_CHROMIUM_path_rendering")));
|
| -}
|
| -
|
| TEST_P(FeatureInfoTest, InitializeCHROMIUM_path_rendering) {
|
| base::CommandLine command_line(0, NULL);
|
| - command_line.AppendSwitch(switches::kEnableGLPathRendering);
|
| SetupInitExpectationsWithGLVersionAndCommandLine(
|
| "GL_ARB_compatibility GL_NV_path_rendering GL_EXT_direct_state_access "
|
| "GL_NV_framebuffer_mixed_samples",
|
| @@ -1329,7 +1319,6 @@ TEST_P(FeatureInfoTest, InitializeCHROMIUM_path_rendering) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeCHROMIUM_path_rendering2) {
|
| base::CommandLine command_line(0, NULL);
|
| - command_line.AppendSwitch(switches::kEnableGLPathRendering);
|
| SetupInitExpectationsWithGLVersionAndCommandLine(
|
| "GL_NV_path_rendering GL_NV_framebuffer_mixed_samples", "",
|
| "OpenGL ES 3.1", command_line);
|
| @@ -1339,7 +1328,6 @@ TEST_P(FeatureInfoTest, InitializeCHROMIUM_path_rendering2) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering) {
|
| base::CommandLine command_line(0, NULL);
|
| - command_line.AppendSwitch(switches::kEnableGLPathRendering);
|
| SetupInitExpectationsWithGLVersionAndCommandLine("GL_ARB_compatibility", "",
|
| "4.3", command_line);
|
| EXPECT_FALSE(info_->feature_flags().chromium_path_rendering);
|
| @@ -1349,7 +1337,6 @@ TEST_P(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering2) {
|
| base::CommandLine command_line(0, NULL);
|
| - command_line.AppendSwitch(switches::kEnableGLPathRendering);
|
| SetupInitExpectationsWithGLVersionAndCommandLine(
|
| "GL_ARB_compatibility GL_NV_path_rendering", "", "4.3", command_line);
|
| EXPECT_FALSE(info_->feature_flags().chromium_path_rendering);
|
| @@ -1359,7 +1346,6 @@ TEST_P(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering2) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeNoCHROMIUM_path_rendering3) {
|
| base::CommandLine command_line(0, NULL);
|
| - command_line.AppendSwitch(switches::kEnableGLPathRendering);
|
| // Missing framebuffer mixed samples.
|
| SetupInitExpectationsWithGLVersionAndCommandLine(
|
| "GL_NV_path_rendering", "", "OpenGL ES 3.1", command_line);
|
|
|