Some cleanup in GrTextureProvider and GrResourceProvider

src/gpu/GrBatchFontCache.cpp

Index: src/gpu/GrBatchFontCache.cpp
diff --git a/src/gpu/GrBatchFontCache.cpp b/src/gpu/GrBatchFontCache.cpp
index d6ffc507e74560957e09b7b33c152223393a6c0d..a65b5797f59903e64ac08f11e80fbb65c7f43b9c 100644
--- a/src/gpu/GrBatchFontCache.cpp
+++ b/src/gpu/GrBatchFontCache.cpp
@@ -10,6 +10,7 @@
 #include "GrFontAtlasSizes.h"
 #include "GrGpu.h"
 #include "GrRectanizer.h"
+#include "GrResourceProvider.h"
 #include "GrSurfacePriv.h"
 #include "SkString.h"
 
@@ -28,8 +29,9 @@ static GrBatchAtlas* make_atlas(GrContext* context, GrPixelConfig config,
 
     // We don't want to flush the context so we claim we're in the middle of flushing so as to
     // guarantee we do not recieve a texture with pending IO
-    GrTexture* texture = context->textureProvider()->refScratchTexture(
-        desc, GrTextureProvider::kApprox_ScratchTexMatch, true);
+    // TODO: Determine how to avoid having to do this. (http://skbug.com/4156)
+    static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag;
+    GrTexture* texture = context->resourceProvider()->createApproxTexture(desc, kFlags);
     if (!texture) {
         return NULL;
     }