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

tests/TextBlobCacheTest.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 "sk_tool_utils.h"
 
 #include "SkCanvas.h"
@@ skipping 48 matching lines @@
     uint32_t flags = 0;
     SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType);
 
     // configure our context for maximum stressing of cache and atlas
     if (stressTest) {
         GrTest::SetupAlwaysEvictAtlas(context);
         context->setTextBlobCacheLimit_ForTesting(0);
     }
 
     SkImageInfo info = SkImageInfo::Make(kWidth, kHeight, kN32_SkColorType, kPremul_SkAlphaType);
-    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkBudgeted::kNo, info,
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, info,
                                                                0, &props));
     REPORTER_ASSERT(reporter, surface);
     if (!surface) {
         return;
     }
 
     SkCanvas* canvas = surface->getCanvas();
 
     SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
 
@@ skipping 86 matching lines @@
 }
 
 DEF_GPUTEST_FOR_NULL_CONTEXT(TextBlobAbnormal, reporter, context) {
     text_blob_cache_inner(reporter, context, 256, 256, 10, false, false);
 }
 
 DEF_GPUTEST_FOR_NULL_CONTEXT(TextBlobStressAbnormal, reporter, context) {
     text_blob_cache_inner(reporter, context, 256, 256, 10, false, true);
 }
 #endif