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

experimental/fiddle/fiddle_main.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <stdio.h>
 
 #include <GL/osmesa.h>
@@ skipping 94 matching lines @@
     }
     if (options.gpu) {
         OSMesaContext osMesaContext = create_osmesa_context();
         SkAutoTUnref<GrContext> grContext(create_mesa_grcontext());
         if (!grContext) {
             fputs("Unable to get Mesa GrContext.\n", stderr);
         } else {
             SkAutoTUnref<SkSurface> surface(
                     SkSurface::NewRenderTarget(
                             grContext,
-                            SkBudgeted::kNo,
+                            SkSurface::kNo_Budgeted,
                             SkImageInfo::MakeN32Premul(options.size)));
             if (!surface) {
                 fputs("Unable to get render surface.\n", stderr);
                 exit(1);
             }
             draw(surface->getCanvas());
             gpuData.reset(encode_snapshot(surface));
         }
         if (osMesaContext) {
             OSMesaDestroyContext(osMesaContext);
@@ skipping 20 matching lines @@
     printf("{\n");
     dump_output(rasterData, "Raster", !gpuData && !pdfData && !skpData);
     dump_output(gpuData, "Gpu", !pdfData && !skpData);
     dump_output(pdfData, "Pdf", !skpData);
     dump_output(skpData, "Skp");
     printf("}\n");
 
     SkSafeSetNull(image);
     return 0;
 }