Remove createUncachedTexture function, attempt to recycle scratch in createTexture.

tests/RecordReplaceDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 
 #include "Test.h"
@@ skipping 106 matching lines @@
                                                          SkIRect::MakeWH(kWidth, kHeight),
                                                          SkMatrix::I(), key, 1, &paint);
 
     GrSurfaceDesc desc;
     desc.fConfig = kSkia8888_GrPixelConfig;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = kWidth;
     desc.fHeight = kHeight;
     desc.fSampleCnt = 0;
 
-    SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0));
+    SkAutoTUnref<GrTexture> texture(context->createTexture(desc, false, NULL, 0));
     layer->setTexture(texture, SkIRect::MakeWH(kWidth, kHeight));
 
     SkAutoTUnref<SkBBoxHierarchy> bbh;
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
     GrRecordReplaceDraw(pic, &canvas, layerCache, SkMatrix::I(), NULL/*callback*/);
 
     int recount = rerecord.count();
     REPORTER_ASSERT(r, 2 == recount || 4 == recount);
@@ skipping 20 matching lines @@
         if (NULL == context) {
             continue;
         }
 
         test_replacements(r, context, true);
         test_replacements(r, context, false);
     }
 }
 
 #endif