Revert of add a ClassID function to GrBatch

src/gpu/batches/GrAAStrokeRectBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAAStrokeRectBatch_DEFINED
 #define GrAAStrokeRectBatch_DEFINED
 
 #include "GrColor.h"
 #include "GrTypes.h"
 #include "GrVertexBatch.h"
 #include "SkMatrix.h"
 #include "SkRect.h"
 
 class GrResourceProvider;
 
 class GrAAStrokeRectBatch : public GrVertexBatch {
 public:
-    DEFINE_BATCH_CLASS_ID
-
     // TODO support AA rotated stroke rects by copying around view matrices
     struct Geometry {
         GrColor fColor;
         SkRect fDevOutside;
         SkRect fDevOutsideAssist;
         SkRect fDevInside;
         bool fMiterStroke;
     };
 
     static GrDrawBatch* Create(const Geometry& geometry, const SkMatrix& viewMatrix) {
@@ skipping 10 matching lines @@
     void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
         out->setUnknownSingleComponent();
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
 private:
     void onPrepareDraws(Target*) override;
     void initBatchTracker(const GrPipelineOptimizations&) override;
 
-    GrAAStrokeRectBatch(const Geometry& geometry, const SkMatrix& viewMatrix)
-        : INHERITED(ClassID()) {
+    GrAAStrokeRectBatch(const Geometry& geometry, const SkMatrix& viewMatrix)  {
+        this->initClassID<GrAAStrokeRectBatch>();
         fBatch.fViewMatrix = viewMatrix;
         fGeoData.push_back(geometry);
 
         // If we have miterstroke then we inset devOutside and outset devOutsideAssist, so we need
         // the join for proper bounds
         fBounds = geometry.fDevOutside;
         fBounds.join(geometry.fDevOutsideAssist);
     }
 
 
@@ skipping 35 matching lines @@
         GrColor fColor;
         bool fUsesLocalCoords;
         bool fColorIgnored;
         bool fCoverageIgnored;
         bool fMiterStroke;
         bool fCanTweakAlphaForCoverage;
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
-
-    typedef GrVertexBatch INHERITED;
 };
 
 
 #endif