use SkAutoTDelete instead of SkTScopedPtr

bench/GrMemoryPoolBench.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This tests a Gr class
 #if SK_SUPPORT_GPU
 
 #include "GrMemoryPool.h"
 #include "SkBenchmark.h"
 #include "SkRandom.h"
-#include "SkTScopedPtr.h"
 #include "SkTDArray.h"
+#include "SkTemplates.h"
 
 // change this to 0 to compare GrMemoryPool to default new / delete
 #define OVERRIDE_NEW    1
 
 namespace {
 struct A {
     int gStuff[10];
 #if OVERRIDE_NEW
     void* operator new (size_t size) { return gPool.allocate(size); }
     void operator delete (void* mem) { if (mem) { return gPool.release(mem); } }
@@ skipping 74 matching lines @@
 protected:
     virtual const char* onGetName() {
         return "grmemorypool_random";
     }
 
     virtual void onDraw(SkCanvas*) {
         SkRandom r;
         enum {
             kMaxObjects = 4 * (1 << 10),
         };
-        SkTScopedPtr<A> objects[kMaxObjects];
+        SkAutoTDelete<A> objects[kMaxObjects];
 
         for (int i = 0; i < N; i++) {
             uint32_t idx = r.nextRangeU(0, kMaxObjects-1);
             if (NULL == objects[idx].get()) {
                 objects[idx].reset(new A);
             } else {
-                objects[idx].reset(NULL);
+                objects[idx].free();
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 /**
  * This benchmark creates objects and deletes them in queue order
@@ skipping 34 matching lines @@
 
 static SkBenchmark* Fact1(void* p) { return new GrMemoryPoolBenchStack(p); }
 static SkBenchmark* Fact2(void* p) { return new GrMemoryPoolBenchRandom(p); }
 static SkBenchmark* Fact3(void* p) { return new GrMemoryPoolBenchQueue(p); }
 
 static BenchRegistry gReg01(Fact1);
 static BenchRegistry gReg02(Fact2);
 static BenchRegistry gReg03(Fact3);
 
 #endif