Templatize GrNonAtomicRef

src/gpu/batches/GrBatch.h

Index: src/gpu/batches/GrBatch.h
diff --git a/src/gpu/batches/GrBatch.h b/src/gpu/batches/GrBatch.h
index a66d6ae308d6e84e84ce0efc38508f28fa867a26..b29c8a49b701ccccee3290233350f9ee1591877f 100644
--- a/src/gpu/batches/GrBatch.h
+++ b/src/gpu/batches/GrBatch.h
@@ -53,10 +53,10 @@ class GrRenderTarget;
         return kClassID; \
     }
 
-class GrBatch : public GrNonAtomicRef {
+class GrBatch : public GrNonAtomicRef<GrBatch> {
 public:
     GrBatch(uint32_t classID);
-    ~GrBatch() override;
+    virtual ~GrBatch();
 
     virtual const char* name() const = 0;
 
@@ -159,7 +159,6 @@ private:
     static int32_t                      gCurrBatchUniqueID;
 #endif
     static int32_t                      gCurrBatchClassID;
-    typedef GrNonAtomicRef INHERITED;
 };
 
 #endif