Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_stream_draw_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 59 matching lines @@
   static uint8_t expected_green[4] = {
       0, 255, 0, 255,
   };
 
   GLuint program = SetupProgram();
   GLuint position_loc = glGetAttribLocation(program, "a_position");
   GLuint color_loc = glGetAttribLocation(program, "a_color");
   GLTestHelper::SetupUnitQuad(position_loc);
   GLTestHelper::SetupColorsForUnitQuad(color_loc, float_red, GL_STREAM_DRAW);
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red));
+  EXPECT_TRUE(
+      GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red, nullptr));
   GLTestHelper::SetupColorsForUnitQuad(color_loc, float_green, GL_STATIC_DRAW);
   glDrawArrays(GL_TRIANGLES, 0, 6);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green,
+                                        nullptr));
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 // http://crbug.com/281565
 #if !defined(OS_ANDROID)
 TEST_F(GLStreamDrawTest, DrawElements) {
   static GLfloat float_red[4] = { 1.0f, 0.0f, 0.0f, 1.0f, };
   static GLfloat float_green[4] = { 0.0f, 1.0f, 0.0f, 1.0f, };
   static uint8_t expected_red[4] = {
       255, 0, 0, 255,
   };
   static uint8_t expected_green[4] = {
       0, 255, 0, 255,
   };
 
   GLuint program = SetupProgram();
   GLuint position_loc = glGetAttribLocation(program, "a_position");
   GLuint color_loc = glGetAttribLocation(program, "a_color");
   GLTestHelper::SetupUnitQuad(position_loc);
   GLTestHelper::SetupColorsForUnitQuad(color_loc, float_red, GL_STREAM_DRAW);
 
   GLuint index_buffer = 0;
   glGenBuffers(1, &index_buffer);
   glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer);
   static GLubyte indices[] = { 0, 1, 2, 3, 4, 5, };
   glBufferData(
       GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STREAM_DRAW);
-  glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, NULL);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red));
+  glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, nullptr);
+  EXPECT_TRUE(
+      GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red, nullptr));
   GLTestHelper::SetupColorsForUnitQuad(color_loc, float_green, GL_STATIC_DRAW);
 
   glBufferData(
       GL_ELEMENT_ARRAY_BUFFER, sizeof(indices), indices, GL_STATIC_DRAW);
-  glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, NULL);
-  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green));
+  glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, nullptr);
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green,
+                                        nullptr));
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 #endif
 
 TEST_F(GLStreamDrawTest, VertexArrayObjects) {
   if (!GLTestHelper::HasExtension("GL_OES_vertex_array_object")) {
     return;
   }
 
@@ skipping 19 matching lines @@
 
   glBindVertexArrayOES(vaos[1]);
   glBindBuffer(GL_ARRAY_BUFFER, position_buffer);
   glEnableVertexAttribArray(position_loc);
   glVertexAttribPointer(position_loc, 2, GL_FLOAT, GL_FALSE, 0, 0);
   GLTestHelper::SetupColorsForUnitQuad(color_loc, float_green, GL_STATIC_DRAW);
 
   for (int ii = 0; ii < 2; ++ii) {
     glBindVertexArrayOES(vaos[0]);
     glDrawArrays(GL_TRIANGLES, 0, 6);
-    EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red));
+    EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_red,
+                                          nullptr));
 
     glBindVertexArrayOES(vaos[1]);
     glDrawArrays(GL_TRIANGLES, 0, 6);
-    EXPECT_TRUE(
-        GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green));
+    EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kSize, kSize, 0, expected_green,
+                                          nullptr));
   }
 
   GLTestHelper::CheckGLError("no errors", __LINE__);
 }
 
 }  // namespace gpu