Revert of More removal of SkColorProfileType...

src/gpu/GrSurface.cpp

Index: src/gpu/GrSurface.cpp
diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp
index 47fa394788645434ce133e5ac0df8e54c9682330..886945c71036052812e3e0e003ad931b1dfd672d 100644
--- a/src/gpu/GrSurface.cpp
+++ b/src/gpu/GrSurface.cpp
@@ -118,11 +118,12 @@
 
 SkImageInfo GrSurface::info(SkAlphaType alphaType) const {
     SkColorType colorType;
-    sk_sp<SkColorSpace> colorSpace;
-    if (!GrPixelConfigToColorAndColorSpace(this->config(), &colorType, &colorSpace)) {
+    SkColorProfileType profileType;
+    if (!GrPixelConfig2ColorAndProfileType(this->config(), &colorType, &profileType)) {
         sk_throw();
     }
-    return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType, colorSpace);
+    return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType,
+                             profileType);
 }
 
 // TODO: This should probably be a non-member helper function. It might only be needed in