Replace SkTScopedPtr with SkAutoTDelete in Skia.

src/core/SkAdvancedTypefaceMetrics.cpp

Index: src/core/SkAdvancedTypefaceMetrics.cpp
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp
index defe68c8a1ed93914824c77b7370b9ff569561eb..c7ed34df191ec6fd6a554fda8d4e8954022fe07a 100644
--- a/src/core/SkAdvancedTypefaceMetrics.cpp
+++ b/src/core/SkAdvancedTypefaceMetrics.cpp
@@ -72,7 +72,7 @@ void resetRange(SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* range,
 
 template <typename Data>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> >* nextSlot,
         int startId) {
     nextSlot->reset(new SkAdvancedTypefaceMetrics::AdvanceMetric<Data>);
     resetRange(nextSlot->get(), startId);
@@ -148,7 +148,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
     //  d. Removing a leading 0/don't cares is a win because it is omitted
     //  e. Removing 2 repeating advances is a win
 
-    SkTScopedPtr<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;
+    SkAutoTDelete<SkAdvancedTypefaceMetrics::AdvanceMetric<Data> > result;
     SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* curRange;
     SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* prevRange = NULL;
     Data lastAdvance = kInvalidAdvance;
@@ -245,12 +245,12 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
     if (curRange->fStartId == lastIndex) {
         SkASSERT(prevRange);
         SkASSERT(prevRange->fNext->fStartId == lastIndex);
-        prevRange->fNext.reset();
+        prevRange->fNext.free();
     } else {
         finishRange(curRange, lastIndex - 1,
                     SkAdvancedTypefaceMetrics::WidthRange::kRange);
     }
-    return result.release();
+    return result.detach();
 }
 
 // Make AdvanceMetric template functions available for linking with typename
@@ -287,7 +287,7 @@ template void resetRange(
         SkAdvancedTypefaceMetrics::WidthRange* range,
         int startId);
 template SkAdvancedTypefaceMetrics::WidthRange* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::WidthRange >* nextSlot,
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::WidthRange >* nextSlot,
         int startId);
 template void finishRange<int16_t>(
         SkAdvancedTypefaceMetrics::WidthRange* range,
@@ -298,7 +298,7 @@ template void resetRange(
         SkAdvancedTypefaceMetrics::VerticalAdvanceRange* range,
         int startId);
 template SkAdvancedTypefaceMetrics::VerticalAdvanceRange* appendRange(
-        SkTScopedPtr<SkAdvancedTypefaceMetrics::VerticalAdvanceRange >*
+        SkAutoTDelete<SkAdvancedTypefaceMetrics::VerticalAdvanceRange >*
             nextSlot,
         int startId);
 template void finishRange<SkAdvancedTypefaceMetrics::VerticalMetric>(