Revert of Cleanup use of legacy SkSurface creation methods a bit

platform_tools/android/examples/hello_skia_app/jni/helloskia.cpp

-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
 #include <math.h>
 #include <jni.h>
 #include <android/bitmap.h>
 
 #include "SkCanvas.h"
 #include "SkGraphics.h"
 #include "SkSurface.h"
 #include "SkString.h"
 #include "SkTime.h"
 
@@ skipping 11 matching lines @@
 {
     // Grab the dst bitmap info and pixels
     AndroidBitmapInfo dstInfo;
     void* dstPixels;
     AndroidBitmap_getInfo(env, dstBitmap, &dstInfo);
     AndroidBitmap_lockPixels(env, dstBitmap, &dstPixels);
 
     SkImageInfo info = SkImageInfo::MakeN32Premul(dstInfo.width, dstInfo.height);
 
     // Create a surface from the given bitmap
-    sk_sp<SkSurface> surface(SkSurface::MakeRasterDirect(info, dstPixels, dstInfo.stride));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterDirect(info, dstPixels, dstInfo.stride));
     SkCanvas* canvas = surface->getCanvas();
 
     // Draw something "interesting"
 
     // Clear the canvas with a white color
     canvas->drawColor(SK_ColorWHITE);
 
     // Setup a SkPaint for drawing our text
     SkPaint paint;
     paint.setColor(SK_ColorBLACK); // This is a solid black color for our text
@@ skipping 18 matching lines @@
         float x = (float)i / 99.0f;
         float offset = elapsedTime / 1000.0f;
         canvas->drawLine(sin(x * M_PI + offset) * 800.0f, 0,   // first endpoint
                          cos(x * M_PI + offset) * 800.0f, 800, // second endpoint
                          paint);                               // SkPapint to tell how to draw the line
     }
 
     // Unlock the dst's pixels
     AndroidBitmap_unlockPixels(env, dstBitmap);
 }