use simpler SkTHashSet in DM to store reference gold

dm/DM.cpp

 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
 #include "SkChecksum.h"
 #include "SkCommonFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkInstCnt.h"
 #include "SkMD5.h"
 #include "SkOSFile.h"
-#include "SkTDynamicHash.h"
+#include "SkTHash.h"
 #include "SkTaskGroup.h"
 #include "Test.h"
 #include "Timer.h"
 
 DEFINE_string(src, "tests gm skp image subset", "Source types to test.");
 DEFINE_bool(nameByHash, false,
             "If true, write to FLAGS_writePath[0]/<hash>.png instead of "
             "to FLAGS_writePath[0]/<config>/<sourceType>/<name>.png");
 DEFINE_bool2(pathOpsExtended, x, false, "Run extended pathOps tests.");
 DEFINE_string(matrix, "1 0 0 1",
@@ skipping 42 matching lines @@
     // We write our dm.json file every once in a while in case we crash.
     // Notice this also handles the final dm.json when pending == 0.
     if (pending % 500 == 0) {
         JsonWriter::DumpJson();
     }
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 struct Gold : public SkString {
+    Gold() : SkString("") {}
     Gold(ImplicitString sink, ImplicitString src, ImplicitString name, ImplicitString md5)
         : SkString("") {
         this->append(sink);
         this->append(src);
         this->append(name);
         this->append(md5);
         while (this->size() % 4) {
             this->append("!");  // Pad out if needed so we can pass this to Murmur3.
         }
     }
-    static const Gold& GetKey(const Gold& g) { return g; }
     static uint32_t Hash(const Gold& g) {
         return SkChecksum::Murmur3((const uint32_t*)g.c_str(), g.size());
     }
 };
-static SkTDynamicHash<Gold, Gold> gGold;
+static SkTHashSet<Gold, Gold::Hash> gGold;
 
 static void add_gold(JsonWriter::BitmapResult r) {
-    gGold.add(new Gold(r.config, r.sourceType, r.name, r.md5));  // We'll let these leak. Lazybones.
+    gGold.add(Gold(r.config, r.sourceType, r.name, r.md5));
 }
 
 static void gather_gold() {
     if (!FLAGS_readPath.isEmpty()) {
         SkString path(FLAGS_readPath[0]);
         path.append("/dm.json");
         if (!JsonWriter::ReadJson(path.c_str(), add_gold)) {
             fail(SkStringPrintf("Couldn't read %s for golden results.", path.c_str()));
         }
     }
@@ skipping 227 matching lines @@
                     hash.write(bitmap.getPixels(), bitmap.getSize());
                 }
                 SkMD5::Digest digest;
                 hash.finish(digest);
                 for (int i = 0; i < 16; i++) {
                     md5.appendf("%02x", digest.data[i]);
                 }
             }
 
             if (!FLAGS_readPath.isEmpty() &&
-                !gGold.find(Gold(task->sink.tag, task->src.tag, name, md5))) {
+                !gGold.contains(Gold(task->sink.tag, task->src.tag, name, md5))) {
                 fail(SkStringPrintf("%s not found for %s %s %s in %s",
                                     md5.c_str(),
                                     task->sink.tag,
                                     task->src.tag,
                                     name.c_str(),
                                     FLAGS_readPath[0]));
             }
 
             if (!FLAGS_writePath.isEmpty()) {
                 const char* ext = task->sink->fileExtension();
@@ skipping 206 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif