Reland of gpu: Clarify sized texture format is available (https://codereview.chromium.org/211718300…

gpu/command_buffer/service/framebuffer_manager_unittest.cc

Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index 1884200a53ac48986058a2f7cd5e7282bd625709..bb8e2fb2ca08d29a0ad7864115ea736c159ed324 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -135,14 +135,18 @@ class FramebufferInfoTestBase : public GpuServiceTest {
 
  protected:
   void SetUp() override {
-    InitializeContext("2.0", "GL_EXT_framebuffer_object");
+    bool is_es3 = false;
+    if (context_type_ == CONTEXT_TYPE_WEBGL2 ||
+        context_type_ == CONTEXT_TYPE_OPENGLES3)
+      is_es3 = true;
+    InitializeContext(is_es3 ? "3.0" : "2.0", "GL_EXT_framebuffer_object");
   }
 
   void InitializeContext(const char* gl_version, const char* extensions) {
     GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
         extensions, "", gl_version, context_type_);
-    feature_info_->InitializeForTesting();
+    feature_info_->InitializeForTesting(context_type_);
     decoder_.reset(new MockGLES2Decoder());
     manager_.CreateFramebuffer(kClient1Id, kService1Id);
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
@@ -490,7 +494,7 @@ TEST_F(FramebufferInfoTest, AttachTexture2D) {
   const GLsizei kWidth3 = 75;
   const GLsizei kHeight3 = 123;
   const GLint kLevel3 = 0;
-  const GLenum kFormat3 = GL_RGB565;
+  const GLenum kFormat3 = GL_RGBA;
   const GLsizei kSamples3 = 0;
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
@@ -1278,11 +1282,10 @@ TEST_F(FramebufferInfoTest, DrawBufferMasks) {
       framebuffer_->ValidateAndAdjustDrawBuffers(0x310u, 0x330u));
 }
 
-class FramebufferInfoFloatTest : public FramebufferInfoTest {
+class FramebufferInfoFloatTest : public FramebufferInfoTestBase {
  public:
   FramebufferInfoFloatTest()
-    : FramebufferInfoTest() {
-  }
+      : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
   ~FramebufferInfoFloatTest() override {}
 
  protected:
@@ -1547,18 +1550,6 @@ class FramebufferInfoES3Test : public FramebufferInfoTestBase {
   void SetUp() override {
     InitializeContext("OpenGL ES 3.0", "");
   }
-
-  void InitializeContext(const char* gl_version, const char* extensions) {
-    GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
-    TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
-        extensions, "", gl_version, context_type_);
-    feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
-    decoder_.reset(new MockGLES2Decoder());
-    manager_.CreateFramebuffer(kClient1Id, kService1Id);
-    error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
-    framebuffer_ = manager_.GetFramebuffer(kClient1Id);
-    ASSERT_TRUE(framebuffer_ != nullptr);
-  }
 };
 
 TEST_F(FramebufferInfoES3Test, DifferentDimensions) {