Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()."
This reverts commit 4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443.
BUG=skia:
Review URL: https://codereview.chromium.org/382523002
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 93ba3c2..610e337 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 @@
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();
}