Revert of GrResourceCache2 manages scratch texture.

src/gpu/GrResourceCache2.h

Index: src/gpu/GrResourceCache2.h
diff --git a/src/gpu/GrResourceCache2.h b/src/gpu/GrResourceCache2.h
index da088a6ead3a822858bf227ddb2fb1ea06935e89..e05efd744e44d9e75b157e8c67f9e53648f39fd1 100644
--- a/src/gpu/GrResourceCache2.h
+++ b/src/gpu/GrResourceCache2.h
@@ -24,15 +24,13 @@
     GrResourceCache2() : fCount(0) {};
     ~GrResourceCache2();
 
-    void insertResource(GrGpuResource*);
+    void insertResource(GrGpuResource* resource);
 
-    void removeResource(GrGpuResource*);
+    void removeResource(GrGpuResource* resource);
 
     void abandonAll();
 
     void releaseAll();
-
-    GrGpuResource* findAndRefScratchResource(const GrResourceKey& scratchKey);
 
 private:
 #ifdef SK_DEBUG
@@ -41,8 +39,8 @@
     }
 #endif
 
-    class AvailableForScratchUse;
 
+    void removeScratch(const GrGpuResource* resource);
     struct ScratchMapTraits {
         static const GrResourceKey& GetKey(const GrGpuResource& r) {
             return r.getScratchKey();