Refactor DrawTextureQuad and CheckPixels in gl_tests util

gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc

Index: gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc b/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc
index 35dd0dafde97440a62c51402593793b950e03772..6481a0bac3783f7c2f73dc5ef9bc8c475ce7bfcd 100644
--- a/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc
+++ b/gpu/command_buffer/tests/gl_chromium_path_rendering_unittest.cc
@@ -154,7 +154,8 @@ class CHROMIUMPathRenderingDrawTest : public CHROMIUMPathRenderingTest {
       float fx = kFillCoords[i];
       float fy = kFillCoords[i + 1];
 
-      EXPECT_TRUE(GLTestHelper::CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue));
+      EXPECT_TRUE(
+          GLTestHelper::CheckPixels(x + fx, y + fy, 1, 1, 0, kBlue, nullptr));
     }
   }
 
@@ -168,8 +169,8 @@ class CHROMIUMPathRenderingDrawTest : public CHROMIUMPathRenderingTest {
       float bx = kBackgroundCoords[i];
       float by = kBackgroundCoords[i + 1];
 
-      EXPECT_TRUE(
-          GLTestHelper::CheckPixels(x + bx, y + by, 1, 1, 0, kExpectedColor));
+      EXPECT_TRUE(GLTestHelper::CheckPixels(x + bx, y + by, 1, 1, 0,
+                                            kExpectedColor, nullptr));
     }
   }
 
@@ -177,13 +178,17 @@ class CHROMIUMPathRenderingDrawTest : public CHROMIUMPathRenderingTest {
     SCOPED_TRACE(testing::Message() << "Verifying stroke at " << x << "," << y);
     // Inside the stroke we should have green.
     const uint8_t kGreen[] = {0, 255, 0, 255};
-    EXPECT_TRUE(GLTestHelper::CheckPixels(x + 50, y + 53, 1, 1, 0, kGreen));
-    EXPECT_TRUE(GLTestHelper::CheckPixels(x + 26, y + 76, 1, 1, 0, kGreen));
+    EXPECT_TRUE(
+        GLTestHelper::CheckPixels(x + 50, y + 53, 1, 1, 0, kGreen, nullptr));
+    EXPECT_TRUE(
+        GLTestHelper::CheckPixels(x + 26, y + 76, 1, 1, 0, kGreen, nullptr));
 
     // Outside the path we should have black.
     const uint8_t black[] = {0, 0, 0, 0};
-    EXPECT_TRUE(GLTestHelper::CheckPixels(x + 10, y + 10, 1, 1, 0, black));
-    EXPECT_TRUE(GLTestHelper::CheckPixels(x + 80, y + 80, 1, 1, 0, black));
+    EXPECT_TRUE(
+        GLTestHelper::CheckPixels(x + 10, y + 10, 1, 1, 0, black, nullptr));
+    EXPECT_TRUE(
+        GLTestHelper::CheckPixels(x + 80, y + 80, 1, 1, 0, black, nullptr));
   }
   static const GLfloat kProjectionMatrix[16];
   GLint color_loc_;
@@ -455,8 +460,8 @@ TEST_F(CHROMIUMPathRenderingTest, TestPathObjectState) {
   // Make sure nothing got drawn by the drawing commands that should not produce
   // anything.
   const uint8_t black[] = {0, 0, 0, 0};
-  EXPECT_TRUE(
-      GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 0, black));
+  EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, kResolution, kResolution, 0,
+                                        black, nullptr));
 }
 
 TEST_F(CHROMIUMPathRenderingTest, TestUnnamedPathsErrors) {
@@ -1085,8 +1090,8 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
         color[2] = 0;
         color[3] = 255;
 
-        EXPECT_TRUE(
-            GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color));
+        EXPECT_TRUE(GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color,
+                                              nullptr));
       }
     }
   }
@@ -1185,8 +1190,8 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
         color[2] = 0;
         color[3] = 255;
 
-        EXPECT_TRUE(
-            GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color));
+        EXPECT_TRUE(GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color,
+                                              nullptr));
       }
     }
   }
@@ -1584,8 +1589,8 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
 
           uint8_t color[4] = {0, 255, 0, 255};
 
-          EXPECT_TRUE(
-              GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color));
+          EXPECT_TRUE(GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2,
+                                                color, nullptr));
         }
       }
     }
@@ -1678,8 +1683,8 @@ TEST_P(CHROMIUMPathRenderingWithTexturingTest,
 
         uint8_t color[4] = {0, 255, 0, 255};
 
-        EXPECT_TRUE(
-            GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color));
+        EXPECT_TRUE(GLTestHelper::CheckPixels(px + fx, py + fy, 1, 1, 2, color,
+                                              nullptr));
       }
     }
   }