Revert of Allow creating GLImage-backed textures with glTexStorage2D.

gpu/command_buffer/tests/gl_texture_storage_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <stdint.h>
 
-#include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
-#include "gpu/command_buffer/tests/texture_image_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
 class TextureStorageTest : public testing::Test {
  protected:
   static const GLsizei kResolution = 64;
   void SetUp() override {
     GLManager::Options options;
-    image_factory_.SetRequiredTextureType(GL_TEXTURE_2D);
     options.size = gfx::Size(kResolution, kResolution);
-    options.image_factory = &image_factory_;
     gl_.Initialize(options);
     gl_.MakeCurrent();
 
     glGenTextures(1, &tex_);
     glBindTexture(GL_TEXTURE_2D, tex_);
 
     glGenFramebuffers(1, &fbo_);
     glBindFramebuffer(GL_FRAMEBUFFER, fbo_);
     glFramebufferTexture2D(GL_FRAMEBUFFER,
                            GL_COLOR_ATTACHMENT0,
                            GL_TEXTURE_2D,
                            tex_,
                            0);
 
     const GLubyte* extensions = glGetString(GL_EXTENSIONS);
     extension_available_ = strstr(reinterpret_cast<const char*>(
         extensions), "GL_EXT_texture_storage");
   }
 
   void TearDown() override { gl_.Destroy(); }
 
-  TextureImageFactory image_factory_;
   GLManager gl_;
   GLuint tex_;
   GLuint fbo_;
   bool extension_available_;
 };
 
 TEST_F(TextureStorageTest, CorrectPixels) {
   if (!extension_available_)
     return;
 
@@ skipping 101 matching lines @@
   if (!extension_available_)
     return;
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   // The context is ES2 context.
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8_OES, 4, 4, 0, GL_RGBA,
                GL_UNSIGNED_BYTE, nullptr);
   EXPECT_NE(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
-TEST_F(TextureStorageTest, CorrectImagePixels) {
-  if (!extension_available_)
-    return;
-  if (gl_.gpu_preferences().use_passthrough_cmd_decoder) {
-    // TODO(geofflang): crbug.com/754710
-    LOG(INFO) << "Passthrough command decoder unimplemented feature. Skipping "
-                 "test...";
-    return;
-  }
-
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BUFFER_USAGE_CHROMIUM,
-                  GL_TEXTURE_BUFFER_SCANOUT_CHROMIUM);
-
-  glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 2, 2);
-
-  glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
-                         tex_, 0);
-
-  uint8_t source_pixels[16] = {1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4};
-  glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 2, 2, GL_RGBA, GL_UNSIGNED_BYTE,
-                  source_pixels);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 2, 2, 0, source_pixels, nullptr));
-}
-
 }  // namespace gpu