Revert of BitmapTextBatch and BitmapTextBlob

src/gpu/GrTextContext.h

Index: src/gpu/GrTextContext.h
diff --git a/src/gpu/GrTextContext.h b/src/gpu/GrTextContext.h
index 54b3efd19e13c766cc44f171d82e4eb2778ada1f..0a4beae5ffa9382182ebb808e9ba9eef3e02db51 100644
--- a/src/gpu/GrTextContext.h
+++ b/src/gpu/GrTextContext.h
@@ -23,9 +23,6 @@
 class SkGpuDevice;
 class SkTextBlob;
 
-// For testing textblobs on GPU.
-//#define USE_BITMAP_TEXTBLOBS
-
 /*
  * This class wraps the state for a single text render
  */
@@ -41,9 +38,9 @@
                      const char text[], size_t byteLength,
                      const SkScalar pos[], int scalarsPerPosition,
                      const SkPoint& offset, const SkIRect& clipBounds);
-    virtual void drawTextBlob(GrRenderTarget*, const GrClip&, const SkPaint&,
-                              const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y,
-                              SkDrawFilter*, const SkIRect& clipBounds);
+    void drawTextBlob(GrRenderTarget*, const GrClip&, const SkPaint&,
+                      const SkMatrix& viewMatrix, const SkTextBlob*, SkScalar x, SkScalar y,
+                      SkDrawFilter*, const SkIRect& clipBounds);
 
 protected:
     GrTextContext*                 fFallbackTextContext;
@@ -93,8 +90,6 @@
     // sets extent in stopVector and returns glyph count
     static int MeasureText(SkGlyphCache* cache, SkDrawCacheProc glyphCacheProc,
                            const char text[], size_t byteLength, SkVector* stopVector);
-
-    friend class BitmapTextBatch;
 };
 
 #endif