SkCanvas is no longer refcnted, use SkClipOps

Change-Id: I57469f56187f1ca8624e7a63968124ee925b4c04
diff --git a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
index ec2efc8..e7171c8 100644
--- a/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
+++ b/libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp
@@ -51,7 +51,7 @@
             EXPECT_EQ(mDrawCounter++, 0);
             mCallback(*this);
         }
-        void onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle style) {
+        void onClipRRect(const SkRRect& rrect, SkClipOp op, ClipEdgeStyle style) {
             SkCanvas::onClipRRect(rrect, op, style);
         }
         std::function<void(const SkCanvas&)> mCallback;
@@ -65,10 +65,10 @@
         canvas.drawRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, paint);
     });
 
-    sk_sp<PropertyTestCanvas> canvas(new PropertyTestCanvas(opValidateCallback));
-    RenderNodeDrawable drawable(node.get(), canvas.get(), true);
-    canvas->drawDrawable(&drawable);
-    EXPECT_EQ(1, canvas->mDrawCounter);
+    PropertyTestCanvas canvas(opValidateCallback);
+    RenderNodeDrawable drawable(node.get(), &canvas, true);
+    canvas.drawDrawable(&drawable);
+    EXPECT_EQ(1, canvas.mDrawCounter);
 }
 
 }