Reland of add a ClassID function to GrBatch

gm/convexpolyeffect.cpp

Index: gm/convexpolyeffect.cpp
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index c014e6a7f562a3d51aecd89b6a2148ea47dd70ee..35cc49859ba5e1dc7ed87002129b6c52f02b2fd1 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -31,6 +31,7 @@
 
 class ConvexPolyTestBatch : public GrTestBatch {
 public:
+    DEFINE_BATCH_CLASS_ID
     struct Geometry : public GrTestBatch::Geometry {
         SkRect fBounds;
     };
@@ -43,9 +44,8 @@
 
 private:
     ConvexPolyTestBatch(const GrGeometryProcessor* gp, const Geometry& geo)
-        : INHERITED(gp, geo.fBounds)
+        : INHERITED(ClassID(), gp, geo.fBounds)
         , fGeometry(geo) {
-        this->initClassID<ConvexPolyTestBatch>();
     }
 
     Geometry* geoData(int index) override {