Make GPU configs use kRGBA color type not kN32.

tests/TestConfigParsing.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommonFlagsConfig.h"
 #include "SkColorSpace.h"
 #include "Test.h"
@@ skipping 29 matching lines @@
     REPORTER_ASSERT(reporter, configs[0]->getTag().equals("gpu"));
     REPORTER_ASSERT(reporter, configs[0]->getViaParts().count() == 0);
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getContextType()
                     == GrContextFactory::kNativeGL_ContextType);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseNVPR() == false);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseInstanced() == false);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getUseDIText() == false);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getSamples() == 0);
-    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getColorType() == kN32_SkColorType);
+    REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType);
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu()->getColorSpace() == nullptr);
 #endif
 }
 
 DEF_TEST(ParseConfigs_OutParam, reporter) {
     // Clears the out parameter.
     SkCommandLineFlags::StringArray config1 = make_string_array({"gpu"});
     SkCommandLineConfigArray configs;
     ParseConfigs(config1, &configs);
     REPORTER_ASSERT(reporter, configs.count() == 1);
@@ skipping 59 matching lines @@
     REPORTER_ASSERT(reporter, !configs[16]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[17]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[18]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[19]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[24]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType);
     REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace());
     REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace()->gammaIsLinear());
     REPORTER_ASSERT(reporter, configs[25]->asConfigGpu()->getColorSpace()->toXYZD50() ==
                               srgbColorSpace->toXYZD50());
-    REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kN32_SkColorType);
+    REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorType() == kRGBA_8888_SkColorType);
     REPORTER_ASSERT(reporter, configs[26]->asConfigGpu()->getColorSpace() == srgbColorSpace.get());
     REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorType() == kRGBA_F16_SkColorType);
     REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorSpace());
     REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorSpace()->gammaIsLinear());
     REPORTER_ASSERT(reporter, configs[41]->asConfigGpu()->getColorSpace()->toXYZD50() !=
                               srgbColorSpace->toXYZD50());
     REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getContextType() ==
                               GrContextFactory::kGL_ContextType);
     REPORTER_ASSERT(reporter, configs[33]->asConfigGpu()->getUseInstanced());
     REPORTER_ASSERT(reporter, configs[34]->asConfigGpu()->getContextType() ==
@@ skipping 46 matching lines @@
 #endif
     REPORTER_ASSERT(reporter, configs[27]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[28]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getSamples() == 4);
     REPORTER_ASSERT(reporter, configs[28]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, configs[29]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getSamples() == 4);
     REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseNVPR());
     REPORTER_ASSERT(reporter, configs[29]->asConfigGpu()->getUseDIText());
     REPORTER_ASSERT(reporter, configs[30]->asConfigGpu());
-    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType()  == kN32_SkColorType);
+    REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorType()  == kRGBA_8888_SkColorType);
     REPORTER_ASSERT(reporter, configs[30]->asConfigGpu()->getColorSpace() == srgbColorSpace.get());
     REPORTER_ASSERT(reporter, configs[31]->asConfigGpu());
     REPORTER_ASSERT(reporter, configs[31]->asConfigGpu()->getSamples() == 4);
 #ifdef SK_VULKAN
     REPORTER_ASSERT(reporter, configs[32]->asConfigGpu());
 #endif
 #endif
 }
 
 DEF_TEST(ParseConfigs_ExtendedGpuConfigsCorrect, reporter) {
@@ skipping 188 matching lines @@
             REPORTER_ASSERT(reporter,
                             configs[i]->getViaParts()[j].equals(expectedConfigs[i].vias[j]));
         }
     }
 #if SK_SUPPORT_GPU
     REPORTER_ASSERT(reporter, configs[0]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[1]->asConfigGpu());
     REPORTER_ASSERT(reporter, !configs[2]->asConfigGpu());
 #endif
 }