cc: Test cleanup for layer tree pixel tests.

cc/trees/layer_tree_host_pixeltest_masks.cc

Index: cc/trees/layer_tree_host_pixeltest_masks.cc
diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc
index ff3555d8b2ac983733e1a76d71c1ba493f4aad47..afeaae7c3128b40e28d9e70f83473b96a6f90886 100644
--- a/cc/trees/layer_tree_host_pixeltest_masks.cc
+++ b/cc/trees/layer_tree_host_pixeltest_masks.cc
@@ -57,9 +57,9 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfLayer) {
   mask->SetIsMask(true);
   green->SetMaskLayer(mask.get());
 
-  RunPixelTest(background,
-               base::FilePath(FILE_PATH_LITERAL(
-                   "mask_of_layer.png")));
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
+               base::FilePath(FILE_PATH_LITERAL("mask_of_layer.png")));
 }
 
 TEST_F(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) {
@@ -87,9 +87,9 @@ TEST_F(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) {
   green->SetMaskLayer(mask.get());
   background->AddChild(green);
 
-  RunPixelTest(background,
-               base::FilePath(FILE_PATH_LITERAL(
-                   "image_mask_of_layer.png")));
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
+               base::FilePath(FILE_PATH_LITERAL("image_mask_of_layer.png")));
 }
 
 TEST_F(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
@@ -115,9 +115,9 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfClippedLayer) {
   mask->SetIsMask(true);
   green->SetMaskLayer(mask.get());
 
-  RunPixelTest(background,
-               base::FilePath(FILE_PATH_LITERAL(
-                   "mask_of_clipped_layer.png")));
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
+               base::FilePath(FILE_PATH_LITERAL("mask_of_clipped_layer.png")));
 }
 
 TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplica) {
@@ -144,9 +144,9 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplica) {
   replica->SetTransform(replica_transform);
   green->SetReplicaLayer(replica.get());
 
-  RunPixelTest(background,
-               base::FilePath(FILE_PATH_LITERAL(
-                   "mask_with_replica.png")));
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
+               base::FilePath(FILE_PATH_LITERAL("mask_with_replica.png")));
 }
 
 TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
@@ -182,7 +182,8 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskWithReplicaOfClippedLayer) {
   replica->SetTransform(replica_transform);
   green->SetReplicaLayer(replica.get());
 
-  RunPixelTest(background,
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
                base::FilePath(FILE_PATH_LITERAL(
                    "mask_with_replica_of_clipped_layer.png")));
 }
@@ -216,9 +217,9 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplica) {
   replica->SetMaskLayer(mask.get());
   green->SetReplicaLayer(replica.get());
 
-  RunPixelTest(background,
-               base::FilePath(FILE_PATH_LITERAL(
-                   "mask_of_replica.png")));
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
+               base::FilePath(FILE_PATH_LITERAL("mask_of_replica.png")));
 }
 
 TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
@@ -258,7 +259,8 @@ TEST_F(LayerTreeHostMasksPixelTest, MaskOfReplicaOfClippedLayer) {
   replica->SetMaskLayer(mask.get());
   green->SetReplicaLayer(replica.get());
 
-  RunPixelTest(background,
+  RunPixelTest(GL_WITH_BITMAP,
+               background,
                base::FilePath(FILE_PATH_LITERAL(
                    "mask_of_replica_of_clipped_layer.png")));
 }