More removal of SkColorProfileType...

gm/textblobgeometrychange.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkCanvas.h"
@@ skipping 24 matching lines @@
         paint.setTextSize(20);
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
 
         SkTextBlobBuilder builder;
 
         sk_tool_utils::add_to_text_blob(&builder, text, paint, 10, 10);
 
         SkAutoTUnref<const SkTextBlob> blob(builder.build());
 
-        SkImageInfo info = SkImageInfo::MakeN32Premul(200, 200, canvas->imageInfo().profileType());
+        SkImageInfo info = SkImageInfo::MakeN32(200, 200, kPremul_SkAlphaType,
+                                                sk_ref_sp(canvas->imageInfo().colorSpace()));
         SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType);
         uint32_t gammaCorrect = canvas->getProps(&canvasProps)
             ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0;
         SkSurfaceProps props(gammaCorrect, kUnknown_SkPixelGeometry);
         auto surface = canvas->makeSurface(info, &props);
         if (!surface) {
             surface = SkSurface::MakeRaster(info, &props);
         }
         SkCanvas* c = surface->getCanvas();
 
@@ skipping 15 matching lines @@
     static const int kWidth = 200;
     static const int kHeight = 200;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new TextBlobGeometryChange;)
 }