Remove SkRefPtr.

tests/UtilsTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkRandom.h"
 #include "SkRefCnt.h"
 #include "SkTSearch.h"
@@ skipping 35 matching lines @@
     REPORTER_ASSERT(reporter, 1 == obj.getRefCnt());
 }
 
 static void test_autostarray(skiatest::Reporter* reporter) {
     RefClass obj0(0);
     RefClass obj1(1);
     REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
     REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 
     {
-        SkAutoSTArray<2, SkRefPtr<RefClass> > tmp;
+        SkAutoSTArray<2, SkAutoTUnref<RefClass> > tmp;
         REPORTER_ASSERT(reporter, 0 == tmp.count());
 
         tmp.reset(0);   // test out reset(0) when already at 0
         tmp.reset(4);   // this should force a new allocation
         REPORTER_ASSERT(reporter, 4 == tmp.count());
-        tmp[0] = &obj0;
-        tmp[1] = &obj1;
+        tmp[0].reset(SkRef(&obj0));
+        tmp[1].reset(SkRef(&obj1));
         REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt());
 
         // test out reset with data in the array (and a new allocation)
         tmp.reset(0);
         REPORTER_ASSERT(reporter, 0 == tmp.count());
         REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 
         tmp.reset(2);   // this should use the preexisting allocation
         REPORTER_ASSERT(reporter, 2 == tmp.count());
-        tmp[0] = &obj0;
-        tmp[1] = &obj1;
+        tmp[0].reset(SkRef(&obj0));
+        tmp[1].reset(SkRef(&obj1));
     }
 
     // test out destructor with data in the array (and using existing allocation)
     REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
     REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 
     {
         // test out allocating ctor (this should allocate new memory)
-        SkAutoSTArray<2, SkRefPtr<RefClass> > tmp(4);
+        SkAutoSTArray<2, SkAutoTUnref<RefClass> > tmp(4);
         REPORTER_ASSERT(reporter, 4 == tmp.count());
 
-        tmp[0] = &obj0;
-        tmp[1] = &obj1;
+        tmp[0].reset(SkRef(&obj0));
+        tmp[1].reset(SkRef(&obj1));
         REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt());
 
         // Test out resut with data in the array and malloced storage
         tmp.reset(0);
         REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 
         tmp.reset(2);   // this should use the preexisting storage
-        tmp[0] = &obj0;
-        tmp[1] = &obj1;
+        tmp[0].reset(SkRef(&obj0));
+        tmp[1].reset(SkRef(&obj1));
         REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt());
 
         tmp.reset(4);   // this should force a new malloc
         REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 
-        tmp[0] = &obj0;
-        tmp[1] = &obj1;
+        tmp[0].reset(SkRef(&obj0));
+        tmp[1].reset(SkRef(&obj1));
         REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt());
         REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt());
     }
 
     REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt());
     REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt());
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ skipping 92 matching lines @@
         REPORTER_ASSERT(reporter, u0 == gTest[i].fUni);
         REPORTER_ASSERT(reporter,
                         p - gTest[i].fUtf8 == (int)strlen(gTest[i].fUtf8));
     }
 
     test_utf16(reporter);
     test_search(reporter);
     test_autounref(reporter);
     test_autostarray(reporter);
 }