Revert of Move Budgeted enum out of SkSurface, use in GrTextureProvider

gm/image.cpp

Index: gm/image.cpp
diff --git a/gm/image.cpp b/gm/image.cpp
index 2ddda8f8a42935c533bc971181b73a5bc76c1d8e..e79968a18f95b58cfa6e38e98b054eea26d1bd89 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -177,7 +177,7 @@
 
 #if SK_SUPPORT_GPU
         surf2.reset(SkSurface::NewRenderTarget(canvas->getGrContext(),
-                                               SkBudgeted::kNo, info));
+                                               SkSurface::kNo_Budgeted, info));
 #endif
 
         test_surface(canvas, surf0, true);
@@ -262,7 +262,7 @@
 
 static SkImage* make_gpu(const SkImageInfo& info, GrContext* ctx, void (*draw)(SkCanvas*)) {
     if (!ctx) { return nullptr; }
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkBudgeted::kNo, info));
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::kNo_Budgeted, info));
     draw(surface->getCanvas());
     return surface->newImageSnapshot();
 }
@@ -487,7 +487,7 @@
         // Create a texture image
         [context, render_image]() -> SkImage* {
             SkAutoTUnref<SkSurface> surface(
-                SkSurface::NewRenderTarget(context, SkBudgeted::kYes,
+                SkSurface::NewRenderTarget(context, SkSurface::kYes_Budgeted,
                                            SkImageInfo::MakeN32Premul(kSize, kSize)));
             if (!surface) {
                 return nullptr;