switch surface to sk_sp

gm/drawatlascolor.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkRSXform.h"
 #include "SkSurface.h"
 
 // Create a square atlas of:
 //   opaque white  |     opaque red
 //  ------------------------------------
 //   opaque green  |  transparent black
 //
 static sk_sp<SkImage> make_atlas(SkCanvas* caller, int atlasSize) {
     const int kBlockSize = atlasSize/2;
 
     SkImageInfo info = SkImageInfo::MakeN32Premul(atlasSize, atlasSize);
-    SkAutoTUnref<SkSurface> surface(caller->newSurface(info));
+    auto surface(caller->makeSurface(info));
     if (nullptr == surface) {
-        surface.reset(SkSurface::NewRaster(info));
+        surface = SkSurface::MakeRaster(info);
     }
     SkCanvas* canvas = surface->getCanvas();
 
     SkPaint paint;
     paint.setXfermode(SkXfermode::Create(SkXfermode::kSrc_Mode));
 
     paint.setColor(SK_ColorWHITE);
     SkRect r = SkRect::MakeXYWH(0, 0, 
                                 SkIntToScalar(kBlockSize), SkIntToScalar(kBlockSize));
     canvas->drawRect(r, paint);
@@ skipping 133 matching lines @@
     static const int kPad = 2;
     static const int kTextPad = 8;
 
 
     sk_sp<SkImage> fAtlas;
 
     typedef GM INHERITED;
 };
 DEF_GM( return new DrawAtlasColorsGM; )