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 902a9531acd6e7a3155570dbe44524ce551d27e6..45573ba16d124a7db5c690cd8f45d05fec45cbd2 100644 |
--- a/gpu/command_buffer/service/feature_info_unittest.cc |
+++ b/gpu/command_buffer/service/feature_info_unittest.cc |
@@ -210,7 +210,6 @@ TEST_P(FeatureInfoTest, Basic) { |
EXPECT_FALSE(info_->feature_flags().map_buffer_range); |
EXPECT_FALSE(info_->feature_flags().use_async_readpixels); |
EXPECT_FALSE(info_->feature_flags().ext_draw_buffers); |
- EXPECT_FALSE(info_->feature_flags().nv_draw_buffers); |
EXPECT_FALSE(info_->feature_flags().ext_discard_framebuffer); |
EXPECT_FALSE(info_->feature_flags().angle_depth_texture); |
EXPECT_FALSE(info_->feature_flags().ext_read_format_bgra); |
@@ -1466,6 +1465,8 @@ TEST_P(FeatureInfoTest, InitializeWithES3) { |
EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_discard_framebuffer")); |
EXPECT_TRUE(info_->feature_flags().chromium_sync_query); |
EXPECT_TRUE(gl::GLFence::IsSupported()); |
+ EXPECT_EQ(GetContextType() == CONTEXT_TYPE_OPENGLES2, |
+ info_->feature_flags().ext_draw_buffers); |
} |
TEST_P(FeatureInfoTest, InitializeWithES3AndDepthTexture) { |
@@ -1527,19 +1528,6 @@ TEST_P(FeatureInfoTest, InitializeWithNVFence) { |
EXPECT_TRUE(gl::GLFence::IsSupported()); |
} |
-TEST_P(FeatureInfoTest, InitializeWithNVDrawBuffers) { |
- SetupInitExpectationsWithGLVersion("GL_NV_draw_buffers", "", "OpenGL ES 3.0"); |
- EXPECT_TRUE(info_->feature_flags().nv_draw_buffers); |
- EXPECT_TRUE(info_->feature_flags().ext_draw_buffers); |
-} |
- |
-TEST_P(FeatureInfoTest, InitializeWithPreferredEXTDrawBuffers) { |
- SetupInitExpectationsWithGLVersion( |
- "GL_NV_draw_buffers GL_EXT_draw_buffers", "", "OpenGL ES 3.0"); |
- EXPECT_FALSE(info_->feature_flags().nv_draw_buffers); |
- EXPECT_TRUE(info_->feature_flags().ext_draw_buffers); |
-} |
- |
TEST_P(FeatureInfoTest, BlendEquationAdvancedDisabled) { |
base::CommandLine command_line(0, NULL); |
command_line.AppendSwitchASCII( |