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

tests/MetaDataTest.cpp

Index: tests/MetaDataTest.cpp
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 293e12a64d77863bc59408c6f9a1bdf2ea1a5d95..eb7eae9e0f5eb6dfe0a5e15b57f698c59aadb556 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -6,12 +6,11 @@
  */
 
 #include "SkMetaData.h"
-#include "RefCntIs.h"
 #include "Test.h"
 
 static void test_ptrs(skiatest::Reporter* reporter) {
     SkRefCnt ref;
-    REPORTER_ASSERT(reporter, RefCntIs(ref, 1));
+    REPORTER_ASSERT(reporter, 1 == ref.getRefCnt());
 
     {
         SkMetaData md0, md1;
@@ -20,19 +19,19 @@ static void test_ptrs(skiatest::Reporter* reporter) {
         md0.setRefCnt(name, &ref);
         REPORTER_ASSERT(reporter, md0.findRefCnt(name));
         REPORTER_ASSERT(reporter, md0.hasRefCnt(name, &ref));
-        REPORTER_ASSERT(reporter, RefCntIs(ref, 2));
+        REPORTER_ASSERT(reporter, 2 == ref.getRefCnt());
 
         md1 = md0;
         REPORTER_ASSERT(reporter, md1.findRefCnt(name));
         REPORTER_ASSERT(reporter, md1.hasRefCnt(name, &ref));
-        REPORTER_ASSERT(reporter, RefCntIs(ref, 3));
+        REPORTER_ASSERT(reporter, 3 == ref.getRefCnt());
 
         REPORTER_ASSERT(reporter, md0.removeRefCnt(name));
         REPORTER_ASSERT(reporter, !md0.findRefCnt(name));
         REPORTER_ASSERT(reporter, !md0.hasRefCnt(name, &ref));
-        REPORTER_ASSERT(reporter, RefCntIs(ref, 2));
+        REPORTER_ASSERT(reporter, 2 == ref.getRefCnt());
     }
-    REPORTER_ASSERT(reporter, RefCntIs(ref, 1));
+    REPORTER_ASSERT(reporter, 1 == ref.getRefCnt());
 }
 
 DEF_TEST(MetaData, reporter) {