Remove GrResourceKey from GrResourceCache

src/gpu/GrResourceCache2.h

Index: src/gpu/GrResourceCache2.h
diff --git a/src/gpu/GrResourceCache2.h b/src/gpu/GrResourceCache2.h
index 9424c40850a22bbf42c438e9544f45ceecf169cc..a797ad3bef8122c0564a70502e2e3c02160fcf85 100644
--- a/src/gpu/GrResourceCache2.h
+++ b/src/gpu/GrResourceCache2.h
@@ -29,13 +29,11 @@ public:
 
     void removeResource(GrGpuResource*);
 
-    void willRemoveContentKey(const GrGpuResource*);
-
     // This currently returns a bool and fails when an existing resource has a key that collides
     // with the new content key. In the future it will null out the content key for the existing
     // resource. The failure is a temporary measure taken because duties are split between two
     // cache objects currently.
-    bool didAddContentKey(GrGpuResource*);
+    bool didSetContentKey(GrGpuResource*);
 
     void abandonAll();
 
@@ -50,7 +48,7 @@ public:
     GrGpuResource* findAndRefScratchResource(const GrResourceKey& scratchKey, uint32_t flags = 0);
     
 #ifdef SK_DEBUG
-    // This is not particularly fast and only used for validation, so debug only.
+    // Not particularly fast and only used for validation, so debug-only
     int countScratchEntriesForKey(const GrResourceKey& scratchKey) const {
         SkASSERT(scratchKey.isScratch());
         return fScratchMap.countForKey(scratchKey);