Remove createUncachedTexture function, attempt to recycle scratch in createTexture.

tests/FloatingPointTextureTest.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.
  */
 
 /*
  * This is a straightforward test of floating point textures, which are
  * supported on some platforms.  As of right now, this test only supports
@@ skipping 41 matching lines @@
             GrContextFactory::GLContextType type =
                 static_cast<GrContextFactory::GLContextType>(glCtxType);
             if (!GrContextFactory::IsRenderingGLContext(type)) {
                 continue;
             }
             GrContext* context = factory->get(type);
             if (NULL == context){
                 continue;
             }
 
-            SkAutoTUnref<GrTexture> fpTexture(
-                    context->createUncachedTexture(desc, controlPixelData.begin(), 0));
+            SkAutoTUnref<GrTexture> fpTexture(context->createTexture(desc, false,
+                                                                     controlPixelData.begin(), 0));
             // Floating point textures are NOT supported everywhere
             if (NULL == fpTexture) {
                 continue;
             }
             fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer.begin(), 0);
             REPORTER_ASSERT(reporter,
                     0 == memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));
         }
     }
 }
@@ skipping 25 matching lines @@
             GrContextFactory::GLContextType type =
                 static_cast<GrContextFactory::GLContextType>(glCtxType);
             if (!GrContextFactory::IsRenderingGLContext(type)) {
                 continue;
             }
             GrContext* context = factory->get(type);
             if (NULL == context){
                 continue;
             }
 
-            SkAutoTUnref<GrTexture> fpTexture(
-                    context->createUncachedTexture(desc, controlPixelData.begin(), 0));
+            SkAutoTUnref<GrTexture> fpTexture(context->createTexture(desc, false,
+                                                                     controlPixelData.begin(), 0));
             // 16-bit floating point textures are NOT supported everywhere
             if (NULL == fpTexture) {
                 continue;
             }
             fpTexture->readPixels(0, 0, DEV_W, DEV_H, desc.fConfig, readBuffer.begin(), 0);
             REPORTER_ASSERT(reporter,
                     0 == memcmp(readBuffer.begin(), controlPixelData.begin(), readBuffer.bytes()));
         }
     }
 }
 
 #endif