Merge GrGpuObject and GrCacheable.

src/gpu/GrCacheable.cpp

Index: src/gpu/GrCacheable.cpp
diff --git a/src/gpu/GrCacheable.cpp b/src/gpu/GrCacheable.cpp
deleted file mode 100644
index 5dc52581173075b9003e139530f536eea9736342..0000000000000000000000000000000000000000
--- a/src/gpu/GrCacheable.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-
-#include "GrCacheable.h"
-
-uint32_t GrCacheable::CreateUniqueID() {
-    static int32_t gCacheableID = SK_InvalidUniqueID;
-    uint32_t id;
-    do {
-        id = static_cast<uint32_t>(sk_atomic_inc(&gCacheableID) + 1);
-    } while (id == SK_InvalidUniqueID);
-    return id;
-}