Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_bind_uniform_location_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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/tests/gl_manager.h"
@@ skipping 77 matching lines @@
     0.0f, 0.0f, 0.75f, 0.0f,
   };
 
   glUniform4f(color_a_location, 0.25f, 0.0f, 0.0f, 0.0f);
   glUniform4fv(color_b_location, 2, color_b);
   glUniform4f(color_c_location, 0.0f, 0.0f, 0.0f, 1.0f);
 
   glDrawArrays(GL_TRIANGLES, 0, 6);
 
   static const uint8_t expected[] = {64, 128, 192, 255};
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 1, expected));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 1,
+                                        expected, nullptr));
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 TEST_P(BindUniformLocationTest, ConflictsDetection) {
   ASSERT_TRUE(
       GLTestHelper::HasExtension("GL_CHROMIUM_bind_uniform_location"));
 
   static const char* v_shader_str = SHADER(
       attribute vec4 a_position;
@@ skipping 145 matching lines @@
   glUniformMatrix4fv(matrix_location, 1, false, identity);
   glUniform2fv(color_a_location, 4, color_a);
   glUniform4f(color_b_location, 0.2f, 0.2f, 0.2f, 0.2f);
   glUniform1f(alpha_location, 0.8f);
   glUniform4f(multiplier_location, 0.5f, 0.5f, 0.5f, 0.5f);
   glUniform3fv(color_c_location, 8, color_c);
 
   glDrawArrays(GL_TRIANGLES, 0, 6);
 
   static const uint8_t expected[] = {204, 204, 204, 204};
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 1, expected));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 1,
+                                        expected, nullptr));
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 
 }
 
 TEST_P(BindUniformLocationTest, UnusedUniformUpdate) {
   ASSERT_TRUE(GLTestHelper::HasExtension("GL_CHROMIUM_bind_uniform_location"));
 
   // clang-format off
   static const char* kVertexShaderString = SHADER(
@@ skipping 126 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(WithAndWithoutShaderNameMapping,
                         BindUniformLocationTest,
                         ::testing::Bool());
 
 }  // namespace gpu