Revert of More removal of SkColorProfileType...

src/gpu/SkGrPriv.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGrPriv_DEFINED
 #define SkGrPriv_DEFINED
 
@@ skipping 84 matching lines @@
                                  const SkMatrix& viewM,
                                  sk_sp<GrFragmentProcessor> fp,
                                  bool textureIsAlphaOnly,
                                  bool allowSRGBInputs,
                                  GrPaint* grPaint);
 
 //////////////////////////////////////////////////////////////////////////////
 
 GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&, const GrCaps&);
 
-bool GrPixelConfigToColorAndColorSpace(GrPixelConfig, SkColorType*, sk_sp<SkColorSpace>*);
+bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*);
 
 /**
  *  If the compressed data in the SkData is supported (as a texture format, this returns
  *  the pixel-config that should be used, and sets outStartOfDataToUpload to the ptr into
  *  the data where the actual raw data starts (skipping any header bytes).
  *
  *  If the compressed data is not supported, this returns kUnknown_GrPixelConfig, and
  *  ignores outStartOfDataToUpload.
  */
 GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data,
@@ skipping 31 matching lines @@
 GR_STATIC_ASSERT((int)kIDC_GrBlendCoeff == (int)SkXfermode::kIDC_Coeff);
 GR_STATIC_ASSERT((int)kSA_GrBlendCoeff == (int)SkXfermode::kSA_Coeff);
 GR_STATIC_ASSERT((int)kISA_GrBlendCoeff == (int)SkXfermode::kISA_Coeff);
 GR_STATIC_ASSERT((int)kDA_GrBlendCoeff == (int)SkXfermode::kDA_Coeff);
 GR_STATIC_ASSERT((int)kIDA_GrBlendCoeff == (int)SkXfermode::kIDA_Coeff);
 GR_STATIC_ASSERT(SkXfermode::kCoeffCount == 10);
 
 #define SkXfermodeCoeffToGrBlendCoeff(X) ((GrBlendCoeff)(X))
 
 #endif