Add CONTEXT_TYPE_OPENGLES2_PEPPER

gpu/command_buffer/service/feature_info_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 87 matching lines @@
       const char* renderer,
       const char* version,
       const base::CommandLine& command_line) {
     GpuServiceTest::SetUpWithGLVersion(version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
         gl_.get(), extensions, renderer, version);
     info_ = new FeatureInfo(command_line);
     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);
   }
 
   void SetupInitExpectationsWithCommandLine(
       const char* extensions,
       const base::CommandLine& command_line) {
     GpuServiceTest::SetUpWithGLVersion("2.0", extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
@@ skipping 1285 matching lines @@
   EXPECT_TRUE(info_->validators()->read_pixel_format.IsValid(GL_RG_EXT));
   EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_R8_EXT));
   EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_RG8_EXT));
 }
 
 TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
   SetupInitExpectations("GL_APPLE_ycbcr_422");
   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