Revert of Add factory class for generating various flavors of GrTextContext.

include/gpu/GrBitmapTextContext.h

Index: include/gpu/GrBitmapTextContext.h
diff --git a/include/gpu/GrBitmapTextContext.h b/include/gpu/GrBitmapTextContext.h
index e1b3d725a93817b51308c65f9f1a7b243b2a0f73..e0900ecd7d625629418dd26e29a40d6617070bee 100755
--- a/include/gpu/GrBitmapTextContext.h
+++ b/include/gpu/GrBitmapTextContext.h
@@ -17,14 +17,13 @@
  */
 class GrBitmapTextContext : public GrTextContext {
 public:
+    GrBitmapTextContext(GrContext*, const GrPaint&, SkColor);
+    virtual ~GrBitmapTextContext();
+
     virtual void drawPackedGlyph(GrGlyph::PackedID, GrFixed left, GrFixed top,
                          GrFontScaler*) SK_OVERRIDE;
 
 private:
-    GrBitmapTextContext(GrContext*, const GrPaint&, const SkPaint&);
-    virtual ~GrBitmapTextContext();
-    friend class GrTTextContextManager<GrBitmapTextContext>;
-
     GrContext::AutoMatrix  fAutoMatrix;
     GrTextStrike*          fStrike;
 
@@ -37,6 +36,7 @@
         kDefaultRequestedVerts   = kDefaultRequestedGlyphs * 4,
     };
 
+    SkColor                 fSkPaintColor;
     SkPoint*                fVertices;
     int32_t                 fMaxVertices;
     GrTexture*              fCurrTexture;