diff --git a/samplecode/DecodeFile.h b/samplecode/DecodeFile.h
index b954af6..95f3e39 100644
--- a/samplecode/DecodeFile.h
+++ b/samplecode/DecodeFile.h
@@ -15,7 +15,7 @@
                                bool requireUnpremul = false) {
     SkASSERT(kIndex_8_SkColorType != colorType);
     sk_sp<SkData> data(SkData::MakeFromFileName(filename));
-    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(data));
+    std::unique_ptr<SkCodec> codec(SkCodec::NewFromData(data));
     if (!codec) {
         return false;
     }
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 3011f5f..c52541d 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -175,7 +175,7 @@
     SkPipeDeserializer      fPipeDeserializer;
 
     SkPictureRecorder fRecorder;
-    SkAutoTDelete<SkCanvas> fFlagsFilterCanvas;
+    std::unique_ptr<SkCanvas> fFlagsFilterCanvas;
     SkPath fClipPath;
 
     SkTouchGesture fGesture;
diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp
index a36b29f..110aa58 100644
--- a/samplecode/SamplePdfFileViewer.cpp
+++ b/samplecode/SamplePdfFileViewer.cpp
@@ -36,7 +36,7 @@
     SkPicture*  fPicture;  // TODO(edisonn): multiple pages, one page / picture, make it an array
 
     static SkPicture* LoadPdf(const char path[]) {
-        SkAutoTDelete<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(path));
+        std::unique_ptr<SkPdfRenderer> renderer(SkPdfRenderer::CreateFromFile(path));
         if (nullptr == renderer.get()) {
             return nullptr;
         }
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index 8548328..a826edd 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -199,7 +199,7 @@
             return nullptr;
         }
 
-        SkAutoTDelete<SkBBHFactory> factory;
+        std::unique_ptr<SkBBHFactory> factory;
         switch (bbox) {
         case kNo_BBoxType:
             // no bbox playback necessary