Fix two leaks & improve leak tracking

include/lazy/SkImageCache.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageCache_DEFINED
 #define SkImageCache_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkTypes.h"
 
 /**
  *  Interface for a cache that manages pixel memory.
  */
 class SkImageCache : public SkRefCnt {
 
 public:
+    SK_DECLARE_INST_COUNT(SkImageCache)
+
     typedef intptr_t ID;
 
     /**
      *  Allocate memory whose lifetime is managed by the cache. On success, MUST be balanced with a
      *  call to releaseCache and a call to throwAwayCache.
      *  @param bytes Number of bytes needed.
      *  @param ID Output parameter which must not be NULL. On success, ID will be set to a value
      *      associated with that memory which can be used as a parameter to the other functions
      *      in SkImageCache. On failure, ID is unchanged.
      *  @return Pointer to the newly allocated memory, or NULL. This memory is safe to use until
@@ skipping 86 matching lines @@
      *  Debug only function to get the status of a particular block of memory. Safe to call after
      *  throwAwayCache has been called with this ID.
      */
     virtual MemoryStatus getMemoryStatus(intptr_t ID) const = 0;
 
     /**
      *  Debug only function to clear all unpinned caches.
      */
     virtual void purgeAllUnpinnedCaches() = 0;
 #endif
+
+private:
+    typedef SkRefCnt INHERITED;
 };
 #endif // SkImageCache_DEFINED