Remove expectations / -r from DM entirely.

dm/DMSKPTask.cpp

Index: dm/DMSKPTask.cpp
diff --git a/dm/DMSKPTask.cpp b/dm/DMSKPTask.cpp
index 9e376e7eb24cd50a9519f4f1af29ff34959d8da4..21bd9b13fda0ad206d77af662f3e9b10e3e58a45 100644
--- a/dm/DMSKPTask.cpp
+++ b/dm/DMSKPTask.cpp
@@ -1,5 +1,4 @@
 #include "DMSKPTask.h"
-#include "DMExpectationsTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 
@@ -13,12 +12,10 @@ namespace DM {
 
 SKPTask::SKPTask(Reporter* r,
                  TaskRunner* tr,
-                 const Expectations& expectations,
                  const SkPicture* pic,
                  SkString filename)
     : CpuTask(r, tr)
     , fPicture(SkRef(pic))
-    , fExpectations(expectations)
     , fName(FileToTaskName(filename)) {}
 
 void SKPTask::draw() {
@@ -29,7 +26,6 @@ void SKPTask::draw() {
     DrawPicture(*fPicture, &bitmap);
 
     this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
-    this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap)));
 }
 
 }  // namespace DM