Fix GPU resource cache related assertions.

src/gpu/GrResourceCache2.cpp

Index: src/gpu/GrResourceCache2.cpp
diff --git a/src/gpu/GrResourceCache2.cpp b/src/gpu/GrResourceCache2.cpp
index c72fc7c5a84ad1b94f3deafa87c9fc9c0322ced9..65894d33141213c614491072acac28eb215a56e6 100644
--- a/src/gpu/GrResourceCache2.cpp
+++ b/src/gpu/GrResourceCache2.cpp
@@ -217,7 +217,7 @@ GrGpuResource* GrResourceCache2::findAndRefScratchResource(const GrScratchKey& s
 }
 
 void GrResourceCache2::willRemoveScratchKey(const GrGpuResource* resource) {
-    SkASSERT(resource->cacheAccess().isScratch());
+    SkASSERT(resource->cacheAccess().getScratchKey().isValid());
     fScratchMap.remove(resource->cacheAccess().getScratchKey(), resource);
 }