Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()."

tests/RefCntTest.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.
  */
 
 #include "SkRefCnt.h"
 #include "SkTRefArray.h"
 #include "SkThreadUtils.h"
 #include "SkTypes.h"
 #include "SkWeakRefCnt.h"
-#include "RefCntIs.h"
 #include "Test.h"
 
 class InstCounterClass {
 public:
     InstCounterClass() { fCount = gInstCounter++; }
     InstCounterClass(const InstCounterClass& src) {
         fCount = src.fCount;
         gInstCounter += 1;
     }
     virtual ~InstCounterClass() { gInstCounter -= 1; }
 
     static int gInstCounter;
     int fCount;
 };
 
 int InstCounterClass::gInstCounter;
 
 static void test_refarray(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, 0 == InstCounterClass::gInstCounter);
 
     const int N = 10;
     SkTRefArray<InstCounterClass>* array = SkTRefArray<InstCounterClass>::Create(N);
 
-    REPORTER_ASSERT(reporter, RefCntIs(*array, 1));
+    REPORTER_ASSERT(reporter, 1 == array->getRefCnt());
     REPORTER_ASSERT(reporter, N == array->count());
 
     REPORTER_ASSERT(reporter, N == InstCounterClass::gInstCounter);
     array->unref();
     REPORTER_ASSERT(reporter, 0 == InstCounterClass::gInstCounter);
 
     // Now test the copy factory
 
     int i;
     InstCounterClass* src = new InstCounterClass[N];
     REPORTER_ASSERT(reporter, N == InstCounterClass::gInstCounter);
     for (i = 0; i < N; ++i) {
         REPORTER_ASSERT(reporter, i == src[i].fCount);
     }
 
     array = SkTRefArray<InstCounterClass>::Create(src, N);
-    REPORTER_ASSERT(reporter, RefCntIs(*array, 1));
+    REPORTER_ASSERT(reporter, 1 == array->getRefCnt());
     REPORTER_ASSERT(reporter, N == array->count());
 
     REPORTER_ASSERT(reporter, 2*N == InstCounterClass::gInstCounter);
     for (i = 0; i < N; ++i) {
         REPORTER_ASSERT(reporter, i == (*array)[i].fCount);
     }
 
     delete[] src;
     REPORTER_ASSERT(reporter, N == InstCounterClass::gInstCounter);
 
@@ skipping 20 matching lines @@
 
     thing1.setProcessorAffinity(0);
     thing2.setProcessorAffinity(23);
 
     SkASSERT(thing1.start());
     SkASSERT(thing2.start());
 
     thing1.join();
     thing2.join();
 
-    REPORTER_ASSERT(reporter, RefCntIs(*ref, 1));
+    REPORTER_ASSERT(reporter, ref->getRefCnt() == 1);
     ref->unref();
 }
 
 static void bounce_weak_ref(void* data) {
     SkWeakRefCnt* ref = static_cast<SkWeakRefCnt*>(data);
     for (int i = 0; i < 100000; ++i) {
         if (ref->try_ref()) {
             ref->unref();
         }
     }
@@ skipping 23 matching lines @@
     SkASSERT(thing1.start());
     SkASSERT(thing2.start());
     SkASSERT(thing3.start());
     SkASSERT(thing4.start());
 
     thing1.join();
     thing2.join();
     thing3.join();
     thing4.join();
 
-    REPORTER_ASSERT(reporter, RefCntIs(*ref, 1));
-    REPORTER_ASSERT(reporter, WeakRefCntIs(*ref, 1));
+    REPORTER_ASSERT(reporter, ref->getRefCnt() == 1);
+    REPORTER_ASSERT(reporter, ref->getWeakCnt() == 1);
     ref->unref();
 }
 
 DEF_TEST(RefCnt, reporter) {
     test_refCnt(reporter);
     test_weakRefCnt(reporter);
     test_refarray(reporter);
 }