Fix two leaks & improve leak tracking

src/lazy/SkBitmapFactory.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapFactory.h"
 
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkImageCache.h"
 #include "SkImagePriv.h"
 #include "SkLazyPixelRef.h"
 
+SK_DEFINE_INST_COUNT(SkBitmapFactory::CacheSelector)
+
 SkBitmapFactory::SkBitmapFactory(SkBitmapFactory::DecodeProc proc)
     : fDecodeProc(proc)
     , fImageCache(NULL)
     , fCacheSelector(NULL) {
     SkASSERT(fDecodeProc != NULL);
 }
 
 SkBitmapFactory::~SkBitmapFactory() {
     SkSafeUnref(fImageCache);
     SkSafeUnref(fCacheSelector);
@@ skipping 46 matching lines @@
         SkAutoTUnref<SkLazyPixelRef> lazyRef(SkNEW_ARGS(SkLazyPixelRef,
                                                         (data, fDecodeProc, cache)));
         dst->setPixelRef(lazyRef);
         return true;
     } else {
         dst->allocPixels();
         target.fAddr = dst->getPixels();
         return fDecodeProc(data->data(), data->size(), &info, &target);
     }
 }