Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix…

tools/flags/SkCommonFlagsConfig.h

Index: tools/flags/SkCommonFlagsConfig.h
diff --git a/tools/flags/SkCommonFlagsConfig.h b/tools/flags/SkCommonFlagsConfig.h
index 39f1f9788bdabd203e6b59ba3db4b1540839b50d..423cf1118caf86aae781e1a7a93c575879606e4a 100644
--- a/tools/flags/SkCommonFlagsConfig.h
+++ b/tools/flags/SkCommonFlagsConfig.h
@@ -52,23 +52,18 @@
   public:
     typedef GrContextFactory::GLContextType ContextType;
     SkCommandLineConfigGpu(const SkString& tag, const SkTArray<SkString>& viaParts,
-                           ContextType contextType, bool useNVPR, bool useDIText, int samples,
-                           SkColorType colorType, SkColorProfileType profileType);
+                           ContextType contextType, bool useNVPR, bool useDIText, int samples);
     const SkCommandLineConfigGpu* asConfigGpu() const override { return this; }
     ContextType getContextType() const { return fContextType; }
     bool getUseNVPR() const { return fUseNVPR; }
     bool getUseDIText() const { return fUseDIText; }
     int getSamples() const { return fSamples; }
-    SkColorType getColorType() const { return fColorType; }
-    SkColorProfileType getProfileType() const { return fProfileType; }
 
   private:
     ContextType fContextType;
     bool fUseNVPR;
     bool fUseDIText;
     int fSamples;
-    SkColorType fColorType;
-    SkColorProfileType fProfileType;
 };
 #endif