Have GrSurfaceProxys and GrGpuResources draw from the same pool of unique ids

tests/ClearTest.cpp

Index: tests/ClearTest.cpp
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index 4dba4bbb95a1576e53e5fac3a6aca66694f38666..b9ece6bce361a5d81235aa96a24a5599e27a87cd 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -40,14 +40,14 @@ static bool check_rect(GrDrawContext* dc, const SkIRect& rect, uint32_t expected
 static bool reset_dc(sk_sp<GrDrawContext>* dc, GrContext* context, int w, int h) {
     SkDEBUGCODE(uint32_t oldID = 0;)
     if (*dc) {
-        SkDEBUGCODE(oldID = (*dc)->accessRenderTarget()->getUniqueID();)
+        SkDEBUGCODE(oldID = (*dc)->accessRenderTarget()->uniqueID();)
         dc->reset(nullptr);
     }
     context->freeGpuResources();
 
     *dc = context->makeDrawContext(SkBackingFit::kExact, w, h, kRGBA_8888_GrPixelConfig, nullptr);
 
-    SkASSERT((*dc)->accessRenderTarget()->getUniqueID() != oldID);
+    SkASSERT((*dc)->accessRenderTarget()->uniqueID() != oldID);
 
     return *dc != nullptr;
 }