Remove createUncachedTexture function, attempt to recycle scratch in createTexture.

tests/ClipCacheTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 // This is a GR test
 #if SK_SUPPORT_GPU
@@ skipping 13 matching lines @@
 
     GrSurfaceDesc desc;
 
     // let Skia know we will be using this texture as a render target
     desc.fFlags     = kRenderTarget_GrSurfaceFlag;
     desc.fConfig    = kSkia8888_GrPixelConfig;
     desc.fWidth     = X_SIZE;
     desc.fHeight    = Y_SIZE;
 
     // We are initializing the texture with zeros here
-    GrTexture* texture = context->createUncachedTexture(desc, textureData, 0);
+    GrTexture* texture = context->createTexture(desc, false, textureData, 0);
     if (!texture) {
         return NULL;
     }
 
     return texture;
 }
 
 // Ensure that the 'getConservativeBounds' calls are returning bounds clamped
 // to the render target
 static void test_clip_bounds(skiatest::Reporter* reporter, GrContext* context) {
 
     static const int kXSize = 100;
     static const int kYSize = 100;
 
     GrSurfaceDesc desc;
     desc.fFlags     = kRenderTarget_GrSurfaceFlag;
     desc.fConfig    = kAlpha_8_GrPixelConfig;
     desc.fWidth     = kXSize;
     desc.fHeight    = kYSize;
 
-    GrTexture* texture = context->createUncachedTexture(desc, NULL, 0);
+    GrTexture* texture = context->createTexture(desc, false, NULL, 0);
     if (!texture) {
         return;
     }
 
     SkAutoTUnref<GrTexture> au(texture);
 
     SkIRect intScreen = SkIRect::MakeWH(kXSize, kYSize);
     SkRect screen;
 
     screen = SkRect::MakeWH(SkIntToScalar(kXSize),
@@ skipping 158 matching lines @@
         if (NULL == context) {
             continue;
         }
 
         test_cache(reporter, context);
         test_clip_bounds(reporter, context);
     }
 }
 
 #endif