Add CONTEXT_TYPE_OPENGLES2_PEPPER

gpu/command_buffer/service/feature_info_unittest.cc

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 21b489862c1c16a5e53cbe050c1015377ed04b23..bf07ffe67e2b4dd889958117f3855ae0bf093633 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -1426,11 +1426,11 @@ TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
   EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422);
 }
 
-TEST_P(FeatureInfoTest, DisableMsaaOnNonWebGLContexts) {
+TEST_P(FeatureInfoTest, DisableMsaaOnInternalContexts) {
   base::CommandLine command_line(0, NULL);
   command_line.AppendSwitchASCII(
       switches::kGpuDriverBugWorkarounds,
-      base::IntToString(gpu::DISABLE_MSAA_ON_NON_WEBGL_CONTEXTS));
+      base::IntToString(gpu::DISABLE_MSAA_ON_INTERNAL_CONTEXTS));
   SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
       "GL_EXT_multisampled_render_to_texture GL_EXT_framebuffer_multisample",
       "", "", CONTEXT_TYPE_OPENGLES2, command_line);
@@ -1442,7 +1442,7 @@ TEST_P(FeatureInfoTest, DontDisableMsaaOnWebGLContexts) {
   base::CommandLine command_line(0, NULL);
   command_line.AppendSwitchASCII(
       switches::kGpuDriverBugWorkarounds,
-      base::IntToString(gpu::DISABLE_MSAA_ON_NON_WEBGL_CONTEXTS));
+      base::IntToString(gpu::DISABLE_MSAA_ON_INTERNAL_CONTEXTS));
   SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
       "GL_EXT_multisampled_render_to_texture GL_EXT_framebuffer_multisample",
       "", "", CONTEXT_TYPE_WEBGL1, command_line);
@@ -1450,5 +1450,17 @@ TEST_P(FeatureInfoTest, DontDisableMsaaOnWebGLContexts) {
   EXPECT_TRUE(info_->feature_flags().chromium_framebuffer_multisample);
 }
 
+TEST_P(FeatureInfoTest, DontDisableMsaaOnPepperContexts) {
+  base::CommandLine command_line(0, NULL);
+  command_line.AppendSwitchASCII(
+      switches::kGpuDriverBugWorkarounds,
+      base::IntToString(gpu::DISABLE_MSAA_ON_INTERNAL_CONTEXTS));
+  SetupInitExpectationsWithGLVersionAndContextTypeAndCommandLine(
+      "GL_EXT_multisampled_render_to_texture GL_EXT_framebuffer_multisample",
+      "", "", CONTEXT_TYPE_OPENGLES2_PEPPER, command_line);
+  EXPECT_TRUE(info_->feature_flags().multisampled_render_to_texture);
+  EXPECT_TRUE(info_->feature_flags().chromium_framebuffer_multisample);
+}
+
 }  // namespace gles2
 }  // namespace gpu