Fix two leaks & improve leak tracking

include/lazy/SkBitmapFactory.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmapFactory_DEFINED
 #define SkBitmapFactory_DEFINED
 
@@ skipping 54 matching lines @@
      *  @return bool Whether or not a pixel ref was successfully installed.
      */
     bool installPixelRef(SkData*, SkBitmap*);
 
     /**
      *  An object for selecting an SkImageCache to use based on an SkImage::Info.
      */
     class CacheSelector : public SkRefCnt {
 
     public:
+        SK_DECLARE_INST_COUNT(CacheSelector)
         /**
          *  Return an SkImageCache to use based on the provided SkImage::Info. If the caller decides
          *  to hang on to the result, it will call ref, so the implementation should not add a ref
          *  as a result of this call.
          */
         virtual SkImageCache* selectCache(const SkImage::Info&) = 0;
+
+    private:
+        typedef SkRefCnt INHERITED;
     };
 
     /**
      *  Set the function to be used to select which SkImageCache to use. Mutually exclusive with
      *  fImageCache.
      */
     void setCacheSelector(CacheSelector*);
 
 private:
     DecodeProc     fDecodeProc;
     SkImageCache*  fImageCache;
     CacheSelector* fCacheSelector;
 };
 
 #endif // SkBitmapFactory_DEFINED