Ganesh text rendering cleanup.

src/gpu/GrFontCache.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "GrFontCache.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
 #include "GrSurfacePriv.h"
-#include "GrTextStrike.h"
-#include "GrTextStrike_impl.h"
 #include "SkString.h"
 
 #include "SkDistanceFieldGen.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define GR_ATLAS_TEXTURE_WIDTH 1024
 #define GR_ATLAS_TEXTURE_HEIGHT 2048
 
 #define GR_PLOT_WIDTH  256
@@ skipping 313 matching lines @@
                                           glyph->width(), glyph->height(),
                                           storage.get(), &glyph->fAtlasLocation);
 
     if (NULL == plot) {
         return false;
     }
 
     glyph->fPlot = plot;
     return true;
 }