Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_program_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 <GLES2/gl2extchromium.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/service/context_group.h"
@@ skipping 103 matching lines @@
       {
           gl_FragColor = vec4(0, 0, 1, 1);
       }
   );
 
   // Load the program.
   GLuint vs = GLTestHelper::LoadShader(GL_VERTEX_SHADER, v_shader_str);
   GLuint fs = GLTestHelper::LoadShader(GL_FRAGMENT_SHADER, f_red_shader_str);
   GLuint program = GLTestHelper::SetupProgram(vs, fs);
   glUseProgram(program);
-  glShaderSource(fs, 1, &f_blue_shader_str, NULL);
+  glShaderSource(fs, 1, &f_blue_shader_str, nullptr);
   glCompileShader(fs);
   glLinkProgram(program);
   // We specifically don't call UseProgram again.
   GLuint position_loc = glGetAttribLocation(program, "a_position");
   GLTestHelper::SetupUnitQuad(position_loc);
   glDrawArrays(GL_TRIANGLES, 0, 6);
   uint8_t expected_color[] = {
       0, 0, 255, 255,
   };
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_color));
+  EXPECT_TRUE(
+      GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_color, nullptr));
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 TEST_F(GLProgramTest, ShaderLengthSpecified) {
   const std::string valid_shader_str = SHADER(
       attribute vec4 a_position;
       void main()
       {
          gl_Position = a_position;
       }
   );
 
   const std::string invalid_shader = valid_shader_str + "invalid suffix";
 
   // Compiling invalid program should fail.
   const char* invalid_shader_strings[] = { invalid_shader.c_str() };
   GLuint vs = glCreateShader(GL_VERTEX_SHADER);
-  glShaderSource(vs, 1, invalid_shader_strings, NULL);
+  glShaderSource(vs, 1, invalid_shader_strings, nullptr);
   glCompileShader(vs);
 
   GLint compile_state = 0;
   glGetShaderiv(vs, GL_COMPILE_STATUS, &compile_state);
   EXPECT_EQ(GL_FALSE, compile_state);
 
   // Compiling program cutting off invalid parts should succeed.
   const GLint lengths[] = { valid_shader_str.length() };
   glShaderSource(vs, 1, invalid_shader_strings, lengths);
   glCompileShader(vs);
@@ skipping 29 matching lines @@
   GLint color_location = glGetUniformLocation(program, "u_color");
   glUniform4f(color_location, 0.0f, 0.0f, 1.0f, 1.0f);
 
   // We specifically don't call UseProgram again.
   GLuint position_loc = glGetAttribLocation(program, "a_position");
   GLTestHelper::SetupUnitQuad(position_loc);
   glDrawArrays(GL_TRIANGLES, 0, 6);
   uint8_t expected_color[] = {
       0, 0, 255, 255,
   };
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_color));
+  EXPECT_TRUE(
+      GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_color, nullptr));
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 TEST_F(WebGLProgramTest, DeferCompileWithExt) {
   // This test must have extensions enabled.
   gles2::ContextGroup* context_group = gl_.decoder()->GetContextGroup();
   gles2::FeatureInfo* feature_info = context_group->feature_info();
   const gles2::FeatureInfo::FeatureFlags& flags = feature_info->feature_flags();
   if (!flags.ext_frag_depth)
     return;
@@ skipping 62 matching lines @@
   glDeleteShader(fs);
 
   glLinkProgram(program);
 
   GLint linked = 0;
   glGetProgramiv(program, GL_LINK_STATUS, &linked);
   EXPECT_NE(0, linked);
 }
 
 }  // namespace gpu