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

tools/VisualBench/WrappedBenchmark.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef WrappedBenchmark_DEFINED
 #define WrappedBenchmark_DEFINED
 
@@ skipping 87 matching lines @@
 class GpuWrappedBenchmark : public WrappedBenchmark {
 public:
     explicit GpuWrappedBenchmark(const SkSurfaceProps& surfaceProps, Benchmark* bench,
                                  int numSamples)
         : INHERITED(surfaceProps, bench)
         , fNumSamples(numSamples) {}
 
 private:
     void setupOffScreen(SkCanvas* canvas) override {
         fOffScreen.reset(SkSurface::NewRenderTarget(canvas->getGrContext(),
-                                                    SkBudgeted::kNo,
+                                                    SkSurface::kNo_Budgeted,
                                                     canvas->imageInfo(),
                                                     fNumSamples,
                                                     &this->surfaceProps()));
     }
 
     void onBlitToScreen(SkCanvas* canvas, int w, int h) override {
         // We call copySurface directly on the underlying GPU surfaces for a more efficient blit.
         GrRenderTarget* dst, *src;
 
         SkCanvas::LayerIter canvasIter(canvas, false);
@@ skipping 14 matching lines @@
         offscreenIter.next();
         SkASSERT(offscreenIter.done());
 #endif
     }
 
     int fNumSamples;
     typedef WrappedBenchmark INHERITED;
 };
 
 #endif //WrappedBenchmark_DEFINED