Replace GrResourceCache with GrResourceCache2.

include/gpu/GrGpuResource.h

Index: include/gpu/GrGpuResource.h
diff --git a/include/gpu/GrGpuResource.h b/include/gpu/GrGpuResource.h
index 5231b15f897cd86278443c257ee7b6ae0e90bb86..3c87117124d66d98178867ee6af7828d328c410f 100644
--- a/include/gpu/GrGpuResource.h
+++ b/include/gpu/GrGpuResource.h
@@ -16,7 +16,6 @@
 class GrContext;
 class GrGpu;
 class GrResourceCache2;
-class GrResourceCacheEntry;
 
 /**
  * Base class for GrGpuResource. Handles the various types of refs we need. Separated out as a base
@@ -126,7 +125,7 @@ private:
 };
 
 /**
- * Base class for objects that can be kept in the GrResourceCache.
+ * Base class for objects that can be kept in the GrResourceCache2.
  */
 class SK_API GrGpuResource : public GrIORef<GrGpuResource> {
 public:
@@ -257,7 +256,6 @@ private:
 
     uint32_t                fFlags;
 
-    GrResourceCacheEntry*   fCacheEntry;  // NULL if not in cache
     mutable size_t          fGpuMemorySize;
     const uint32_t          fUniqueID;