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

tests/SurfaceTest.cpp

Index: tests/SurfaceTest.cpp
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 93ba3c2b9e508d541d09ea75e00bcc192d1e91c9..610e3370f6a47133544e77aa32a67f27271809d6 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -11,7 +11,6 @@
 #include "SkRRect.h"
 #include "SkSurface.h"
 #include "SkUtils.h"
-#include "RefCntIs.h"
 #include "Test.h"
 
 #if SK_SUPPORT_GPU
@@ -78,11 +77,11 @@ static void test_image(skiatest::Reporter* reporter) {
     void* addr = sk_malloc_throw(size);
     SkData* data = SkData::NewFromMalloc(addr, size);
 
-    REPORTER_ASSERT(reporter, RefCntIs(*data, 1));
+    REPORTER_ASSERT(reporter, 1 == data->getRefCnt());
     SkImage* image = SkImage::NewRasterData(info, data, rowBytes);
-    REPORTER_ASSERT(reporter, RefCntIs(*data, 2));
+    REPORTER_ASSERT(reporter, 2 == data->getRefCnt());
     image->unref();
-    REPORTER_ASSERT(reporter, RefCntIs(*data, 1));
+    REPORTER_ASSERT(reporter, 1 == data->getRefCnt());
     data->unref();
 }