Use ValuesIn to remove lint error

Move RendererType value instantiation into arrays, and use ValuesIn to
remove the linting error for having a comma on a new line.

Bug: 963446
Change-Id: I40095576d14b51e1515d7900b7a30703fa467cab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674643
Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672100}

cc/trees/layer_tree_host_pixeltest_filters.cc

@@ -76,25 +76,31 @@ class LayerTreeHostFiltersPixelTest
   bool layer_transforms_should_scale_layer_contents_ = true;
 };
 
-INSTANTIATE_TEST_SUITE_P(,
-                         LayerTreeHostFiltersPixelTest,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL,
-                                           LayerTreeTest::RENDERER_SOFTWARE
+LayerTreeTest::RendererType const kRendererTypes[] = {
+    LayerTreeTest::RENDERER_GL,
+    LayerTreeTest::RENDERER_SKIA_GL,
+    LayerTreeTest::RENDERER_SOFTWARE,
 #if defined(ENABLE_CC_VULKAN_TESTS)
-                                           ,
-                                           LayerTreeTest::RENDERER_SKIA_VK
+    LayerTreeTest::RENDERER_SKIA_VK,
 #endif
-                                           ));
+};
+
+INSTANTIATE_TEST_SUITE_P(,
+                         LayerTreeHostFiltersPixelTest,
+                         ::testing::ValuesIn(kRendererTypes));
 
 using LayerTreeHostFiltersPixelTestNonVulkan = LayerTreeHostFiltersPixelTest;
 
+LayerTreeTest::RendererType const kRendererTypesNonVulkan[] = {
+    LayerTreeTest::RENDERER_GL,
+    LayerTreeTest::RENDERER_SKIA_GL,
+    LayerTreeTest::RENDERER_SOFTWARE,
+};
+
 // TODO(crbug.com/963446): Enable these tests for Vulkan.
 INSTANTIATE_TEST_SUITE_P(,
                          LayerTreeHostFiltersPixelTestNonVulkan,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL,
-                                           LayerTreeTest::RENDERER_SOFTWARE));
+                         ::testing::ValuesIn(kRendererTypesNonVulkan));
 
 using LayerTreeHostFiltersPixelTestGL = LayerTreeHostFiltersPixelTest;
 
@@ -105,15 +111,17 @@ INSTANTIATE_TEST_SUITE_P(,
 
 using LayerTreeHostFiltersPixelTestGPU = LayerTreeHostFiltersPixelTest;
 
-INSTANTIATE_TEST_SUITE_P(,
-                         LayerTreeHostFiltersPixelTestGPU,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL
+LayerTreeTest::RendererType const kRendererTypesGpu[] = {
+    LayerTreeTest::RENDERER_GL,
+    LayerTreeTest::RENDERER_SKIA_GL,
 #if defined(ENABLE_CC_VULKAN_TESTS)
-                                           ,
-                                           LayerTreeTest::RENDERER_SKIA_VK
+    LayerTreeTest::RENDERER_SKIA_VK,
 #endif
-                                           ));
+};
+
+INSTANTIATE_TEST_SUITE_P(,
+                         LayerTreeHostFiltersPixelTestGPU,
+                         ::testing::ValuesIn(kRendererTypesGpu));
 
 TEST_P(LayerTreeHostFiltersPixelTestGPU, BackdropFilterBlurRect) {
   scoped_refptr<SolidColorLayer> background = CreateSolidColorLayer(
@@ -395,14 +403,7 @@ class LayerTreeHostFiltersScaledPixelTest
 
 INSTANTIATE_TEST_SUITE_P(,
                          LayerTreeHostFiltersScaledPixelTest,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL,
-                                           LayerTreeTest::RENDERER_SOFTWARE
-#if defined(ENABLE_CC_VULKAN_TESTS)
-                                           ,
-                                           LayerTreeTest::RENDERER_SKIA_VK
-#endif
-                                           ));
+                         ::testing::ValuesIn(kRendererTypes));
 
 TEST_P(LayerTreeHostFiltersScaledPixelTest, StandardDpi) {
   RunPixelTestType(100, 1.f);
@@ -1113,13 +1114,7 @@ class BackdropFilterWithDeviceScaleFactorTest
 // when fixed.
 INSTANTIATE_TEST_SUITE_P(,
                          BackdropFilterWithDeviceScaleFactorTest,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL
-#if defined(ENABLE_CC_VULKAN_TESTS)
-                                           ,
-                                           LayerTreeTest::RENDERER_SKIA_VK
-#endif
-                                           ));
+                         ::testing::ValuesIn(kRendererTypesGpu));
 
 TEST_P(BackdropFilterWithDeviceScaleFactorTest, StandardDpi) {
   RunPixelTestType(

cc/trees/layer_tree_host_pixeltest_synchronous.cc

@@ -54,15 +54,17 @@ class LayerTreeHostSynchronousPixelTest
   bool use_zero_copy_ = false;
 };
 
-INSTANTIATE_TEST_SUITE_P(,
-                         LayerTreeHostSynchronousPixelTest,
-                         ::testing::Values(LayerTreeTest::RENDERER_GL,
-                                           LayerTreeTest::RENDERER_SKIA_GL
+LayerTreeTest::RendererType const kRendererTypesGpu[] = {
+    LayerTreeTest::RENDERER_GL,
+    LayerTreeTest::RENDERER_SKIA_GL,
 #if defined(ENABLE_CC_VULKAN_TESTS)
-                                           ,
-                                           LayerTreeTest::RENDERER_SKIA_VK
+    LayerTreeTest::RENDERER_SKIA_VK,
 #endif
-                                           ));
+};
+
+INSTANTIATE_TEST_SUITE_P(,
+                         LayerTreeHostSynchronousPixelTest,
+                         ::testing::ValuesIn(kRendererTypesGpu));
 
 TEST_P(LayerTreeHostSynchronousPixelTest, OneContentLayerZeroCopy) {
   use_zero_copy_ = true;