Revert of add a ClassID function to GrBatch

tests/GrPorterDuffTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkXfermode.h"
 #include "Test.h"
 
@@ skipping 1075 matching lines @@
                 TEST_ASSERT(xpi.fBlendInfo.fWriteColor);
                 break;
             default:
                 ERRORF(reporter, "Invalid xfermode.");
                 break;
         }
     }
 }
 
 static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const GrCaps& caps) {
-    class TestLCDCoverageBatch: public GrVertexBatch {
-    public:
-        DEFINE_BATCH_CLASS_ID
-
-        TestLCDCoverageBatch() : INHERITED(ClassID()) {}
-
-    private:
+    class : public GrVertexBatch {
         void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
             out->setKnownFourComponents(GrColorPackRGBA(123, 45, 67, 221));
         }
 
         void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
             out->setUnknownFourComponents();
             out->setUsingLCDCoverage();
         }
 
         const char* name() const override { return "Test LCD Text Batch"; }
         void initBatchTracker(const GrPipelineOptimizations&) override {}
         bool onCombineIfPossible(GrBatch*, const GrCaps&) override  { return false; }
         void onPrepareDraws(Target*) override {};
 
-        typedef GrVertexBatch INHERITED;
     } testLCDCoverageBatch;
 
     GrProcOptInfo colorPOI, covPOI;
     colorPOI.calcColorWithBatch(&testLCDCoverageBatch, nullptr, 0);
     covPOI.calcCoverageWithBatch(&testLCDCoverageBatch, nullptr, 0);
 
     SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags());
     SkASSERT(covPOI.isFourChannelOutput());
 
     SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(SkXfermode::kSrcOver_Mode));
@@ skipping 82 matching lines @@
                 TEST_ASSERT(!xp->hasSecondaryOutput());
                 xp->getOptimizations(colorPOI, covPOI, false, 0, caps);
                 TEST_ASSERT(!xp->hasSecondaryOutput());
             }
         }
     }
 }
 
 #endif