Remove image usage type enum. Use GrTextureParams instead.

include/gpu/SkGr.h

Index: include/gpu/SkGr.h
diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h
index 8ea3af12c744e69a33b5cd90a016dc4efe6be1d8..591d3d88a437987cd1cb82b6b8bfbd4125e0d9f0 100644
--- a/include/gpu/SkGr.h
+++ b/include/gpu/SkGr.h
@@ -66,9 +66,8 @@ static inline GrColor SkPMColorToGrColor(SkPMColor c) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams*);
-GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, SkImageUsageType);
-
+GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTextureParams&);
+    
 // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses).
 GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, SkColorProfileType);