Remove expectations / -r from DM entirely.

dm/DMWriteTask.cpp

 #include "DMWriteTask.h"
 
 #include "DMUtil.h"
 #include "SkColorPriv.h"
 #include "SkCommonFlags.h"
+#include "SkData.h"
 #include "SkImageEncoder.h"
 #include "SkMD5.h"
 #include "SkMallocPixelRef.h"
 #include "SkOSFile.h"
 #include "SkStream.h"
 #include "SkString.h"
 
 DEFINE_bool(nameByHash, false, "If true, write .../hash.png instead of .../mode/config/name.png");
 
 namespace DM {
@@ skipping 135 matching lines @@
         name.appendf("%s/", fSuffixes[i].c_str());
     }
     name.append(fBaseName.c_str());
     return name;
 }
 
 bool WriteTask::shouldSkip() const {
     return FLAGS_writePath.isEmpty();
 }
 
-WriteTask::Expectations* WriteTask::Expectations::Create(const char* path) {
-    if (!FLAGS_writePath.isEmpty() && 0 == strcmp(FLAGS_writePath[0], path)) {
-        SkDebugf("We seem to be reading and writing %s concurrently.  This won't work.\n", path);
-        return NULL;
-    }
-
-    SkString jsonPath;
-    if (sk_isdir(path)) {
-        jsonPath = SkOSPath::Join(path, "dm.json");
-    } else {
-        jsonPath.set(path);
-    }
-
-    SkAutoDataUnref json(SkData::NewFromFileName(jsonPath.c_str()));
-    if (NULL == json.get()) {
-        SkDebugf("Can't read %s!\n", jsonPath.c_str());
-        return NULL;
-    }
-
-    SkAutoTDelete<Expectations> expectations(SkNEW(Expectations));
-    Json::Reader reader;
-    const char* begin = (const char*)json->bytes();
-    const char* end   = begin + json->size();
-    if (!reader.parse(begin, end, expectations->fJson)) {
-        SkDebugf("Can't read %s as JSON!\n", jsonPath.c_str());
-        return NULL;
-    }
-    return expectations.detach();
-}
-
-bool WriteTask::Expectations::check(const Task& task, SkBitmap bitmap) const {
-    const SkString name = task.name();
-    if (fJson[name.c_str()].isNull()) {
-        return true;  // No expectations.
-    }
-
-    const char* expected = fJson[name.c_str()].asCString();
-    SkAutoTDelete<SkStreamAsset> png(encode_to_png(bitmap));
-    SkString actual = get_md5(png);
-    return actual.equals(expected);
-}
-
 void WriteTask::DumpJson() {
     if (FLAGS_writePath.isEmpty()) {
         return;
     }
 
     // FIXME: This JSON format is a complete MVP strawman.
     Json::Value root;
     {
         SkAutoMutexAcquire lock(&gJsonDataLock);
         for (int i = 0; i < gJsonData.count(); i++) {
             root[gJsonData[i].name.c_str()] = gJsonData[i].md5.c_str();
         }
     }
 
     SkString path = SkOSPath::Join(FLAGS_writePath[0], "dm.json");
     SkFILEWStream stream(path.c_str());
     stream.writeText(Json::StyledWriter().write(root).c_str());
     stream.flush();
 }
 
 }  // namespace DM