Consolidate GPU buffer implementations

src/gpu/vk/GrVkUniformBuffer.h

Index: src/gpu/vk/GrVkUniformBuffer.h
diff --git a/src/gpu/vk/GrVkUniformBuffer.h b/src/gpu/vk/GrVkUniformBuffer.h
index 0eae47b30b9ebe46eec37ec80deeffc5c1dfb83d..ba777bb7c5ee618b6037801c452a38eb04d3a325 100644
--- a/src/gpu/vk/GrVkUniformBuffer.h
+++ b/src/gpu/vk/GrVkUniformBuffer.h
@@ -18,25 +18,16 @@ class GrVkUniformBuffer : public GrVkBuffer {
 public:
     static GrVkUniformBuffer* Create(GrVkGpu* gpu, size_t size, bool dynamic);
 
-    void* map(const GrVkGpu* gpu) {
-        return this->vkMap(gpu);
-    }
-    void unmap(const GrVkGpu* gpu) {
-        this->vkUnmap(gpu);
-    }
+    // TODO: deprecate.
     bool updateData(const GrVkGpu* gpu, const void* src, size_t srcSizeInBytes) {
-        return this->vkUpdateData(gpu, src, srcSizeInBytes);
-    }
-    void release(const GrVkGpu* gpu) {
-        this->vkRelease(gpu);
-    }
-    void abandon() {
-        this->vkAbandon();
+        SkASSERT(gpu == this->vkGpu());
+        return this->INHERITED::updateData(src, srcSizeInBytes);
     }
 
 private:
-    GrVkUniformBuffer(const GrVkBuffer::Desc& desc, const GrVkBuffer::Resource* resource)
-        : INHERITED(desc, resource) {
+    GrVkUniformBuffer(GrVkGpu* gpu, const GrVkBuffer::Desc& desc,
+                      const GrVkBuffer::Resource* resource)
+        : INHERITED(gpu, desc, resource) {
     };
 
     typedef GrVkBuffer INHERITED;