Add CONTEXT_TYPE_OPENGLES2_PEPPER

Adds a new context type for Pepper GL contexts. This allows us to
fine tune driver bug workarounds for pepper vs. non-pepper contexts.

Currently used to disable the Intel MSAA blacklist on pepper contexts,
as it should be up to the app whether to use MSAA.

BUG=527565
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel

Review URL: https://codereview.chromium.org/1781093002

Cr-Commit-Position: refs/heads/master@{#382097}

1 files changed, 0 insertions, 37 deletions

diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
index 63d6b5f..62c3a2e 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -105,19 +105,6 @@ class FeatureInfoTest
     info_->InitializeForTesting();
   }
 
-  void SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
-      const char* extensions,
-      const char* renderer,
-      const char* version,
-      ContextType context_type,
-      const base::CommandLine& command_line) {
-    GpuServiceTest::SetUpWithGLVersion(version, extensions);
-    TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
-        gl_.get(), extensions, renderer, version);
-    info_ = new FeatureInfo(command_line);
-    info_->Initialize(context_type, DisallowedFeatures());
-  }
-
   void SetupWithCommandLine(const base::CommandLine& command_line) {
     GpuServiceTest::SetUp();
     info_ = new FeatureInfo(command_line);
@@ -1423,29 +1410,5 @@ TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
   EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422);
 }
 
-TEST_P(FeatureInfoTest, DisableMsaaOnNonWebGLContexts) {
-  base::CommandLine command_line(0, NULL);
-  command_line.AppendSwitchASCII(
-      switches::kGpuDriverBugWorkarounds,
-      base::IntToString(gpu::DISABLE_MSAA_ON_NON_WEBGL_CONTEXTS));
-  SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
-      "GL_EXT_multisampled_render_to_texture GL_EXT_framebuffer_multisample",
-      "", "", CONTEXT_TYPE_OPENGLES2, command_line);
-  EXPECT_FALSE(info_->feature_flags().multisampled_render_to_texture);
-  EXPECT_FALSE(info_->feature_flags().chromium_framebuffer_multisample);
-}
-
-TEST_P(FeatureInfoTest, DontDisableMsaaOnWebGLContexts) {
-  base::CommandLine command_line(0, NULL);
-  command_line.AppendSwitchASCII(
-      switches::kGpuDriverBugWorkarounds,
-      base::IntToString(gpu::DISABLE_MSAA_ON_NON_WEBGL_CONTEXTS));
-  SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
-      "GL_EXT_multisampled_render_to_texture GL_EXT_framebuffer_multisample",
-      "", "", CONTEXT_TYPE_WEBGL1, command_line);
-  EXPECT_TRUE(info_->feature_flags().multisampled_render_to_texture);
-  EXPECT_TRUE(info_->feature_flags().chromium_framebuffer_multisample);
-}
-
 }  // namespace gles2
 }  // namespace gpu