cc: cc pixel tests test both single/multi texture mask code paths.

cc/test/layer_tree_pixel_resource_test.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 "cc/test/layer_tree_pixel_resource_test.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/raster/bitmap_raster_buffer_provider.h"
@@ skipping 24 matching lines @@
       return false;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace
 
 LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest(
-    PixelResourceTestCase test_case)
+    PixelResourceTestCase test_case,
+    Layer::LayerMaskType mask_type)
     : draw_texture_target_(GL_INVALID_VALUE),
       raster_buffer_provider_type_(RASTER_BUFFER_PROVIDER_TYPE_BITMAP),
       texture_hint_(ResourceProvider::TEXTURE_HINT_IMMUTABLE),
+      mask_type_(mask_type),
       initialized_(false),
       test_case_(test_case) {
   InitializeFromTestCase(test_case);
 }
 
 LayerTreeHostPixelResourceTest::LayerTreeHostPixelResourceTest()
     : draw_texture_target_(GL_INVALID_VALUE),
       raster_buffer_provider_type_(RASTER_BUFFER_PROVIDER_TYPE_BITMAP),
+      mask_type_(Layer::LayerMaskType::SINGLE_TEXTURE_MASK),
       initialized_(false),
       test_case_(SOFTWARE) {}
 
 void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
     PixelResourceTestCase test_case) {
   DCHECK(!initialized_);
   initialized_ = true;
   switch (test_case) {
     case SOFTWARE:
       test_type_ = PIXEL_TEST_SOFTWARE;
@@ skipping 112 matching lines @@
 
 void LayerTreeHostPixelResourceTest::RunPixelResourceTest(
     scoped_refptr<Layer> content_root,
     base::FilePath file_name) {
   if (!IsTestCaseSupported(test_case_))
     return;
   RunPixelTest(test_type_, content_root, file_name);
 }
 
 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
-    : LayerTreeHostPixelResourceTest(GetParam()) {
-}
+    : LayerTreeHostPixelResourceTest(::testing::get<0>(GetParam()),
+                                     ::testing::get<1>(GetParam())) {}
 
 }  // namespace cc