Refactor DrawTextureQuad and CheckPixels in gl_tests util

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/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
@@ skipping 46 matching lines @@
   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));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 2, 2, 0, source_pixels, nullptr));
 }
 
 TEST_F(TextureStorageTest, IsImmutable) {
   if (!extension_available_)
     return;
 
   glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 4, 4);
 
   GLint param = 0;
   glGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_IMMUTABLE_FORMAT_EXT, &param);
@@ skipping 60 matching lines @@
   if (!extension_available_)
     return;
 
   glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 4, 4);
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
   glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGBA8_OES, 4, 4);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
-  glTexImage2D(GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               4, 4,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               NULL);
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 4, 4, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+               nullptr);
   EXPECT_EQ(static_cast<GLenum>(GL_INVALID_OPERATION), glGetError());
 }
 
 TEST_F(TextureStorageTest, InternalFormatBleedingToTexImage) {
   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_EQ(static_cast<GLenum>(GL_INVALID_VALUE), glGetError());
 }
 
 }  // namespace gpu