Fix two leaks & improve leak tracking

include/ports/SkFontConfigInterface.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 SkFontConfigInterface_DEFINED
 #define SkFontConfigInterface_DEFINED
 
 #include "SkDataTable.h"
 #include "SkFontStyle.h"
 #include "SkRefCnt.h"
 #include "SkTArray.h"
 #include "SkTypeface.h"
 
 /**
  *  \class SkFontConfigInterface
  *
  *  Provides SkFontHost clients with access to fontconfig services. They will
  *  access the global instance found in RefGlobal().
  */
 class SK_API SkFontConfigInterface : public SkRefCnt {
 public:
+    SK_DECLARE_INST_COUNT(SkFontConfigInterface)
+
     /**
      *  Returns the global SkFontConfigInterface instance, and if it is not
      *  NULL, calls ref() on it. The caller must balance this with a call to
      *  unref().
      */
     static SkFontConfigInterface* RefGlobal();
 
     /**
      *  Replace the current global instance with the specified one, safely
      *  ref'ing the new instance, and unref'ing the previous. Returns its
@@ skipping 65 matching lines @@
 
     virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); }
     virtual bool matchFamilySet(const char inFamilyName[],
                                 SkString* outFamilyName,
                                 SkTArray<FontIdentity>*) {
         return false;
     }
 };
 
 #endif