Fix two leaks & improve leak tracking

gm/gm_expectations.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 gm_expectations_DEFINED
 #define gm_expectations_DEFINED
 
 #include "gm.h"
@@ skipping 154 matching lines @@
         SkTArray<GmResultDigest> fAllowedResultDigests;
         bool fIgnoreFailure;
         SkBitmap fBitmap;
     };
 
     /**
      * Abstract source of Expectations objects for individual tests.
      */
     class ExpectationsSource : public SkRefCnt {
     public:
+        SK_DECLARE_INST_COUNT(ExpectationsSource)
+
         virtual Expectations get(const char *testName) = 0;
+
+    private:
+        typedef SkRefCnt INHERITED;
     };
 
     /**
      * Return Expectations based on individual image files on disk.
      */
     class IndividualImageExpectationsSource : public ExpectationsSource {
     public:
         /**
          * Create an ExpectationsSource that will return Expectations based on
          * image files found within rootDir.
@@ skipping 73 matching lines @@
          * Returns true if successful.
          */
         static bool Parse(const char *jsonPath, Json::Value *jsonRoot);
 
         Json::Value fJsonRoot;
         Json::Value fJsonExpectedResults;
     };
 
 }
 #endif