Remove expectations / -r from DM entirely.

dm/DMCpuGMTask.cpp

Index: dm/DMCpuGMTask.cpp
diff --git a/dm/DMCpuGMTask.cpp b/dm/DMCpuGMTask.cpp
index e3dd0eaf9815afe0f817a8fbd68751284ddbf21c..da650c454b2a8c6c08b69c7fdcc48f4a05070fe7 100644
--- a/dm/DMCpuGMTask.cpp
+++ b/dm/DMCpuGMTask.cpp
@@ -1,5 +1,4 @@
 #include "DMCpuGMTask.h"
-#include "DMExpectationsTask.h"
 #include "DMPipeTask.h"
 #include "DMQuiltTask.h"
 #include "DMSerializeTask.h"
@@ -12,13 +11,11 @@ CpuGMTask::CpuGMTask(const char* config,
                      Reporter* reporter,
                      TaskRunner* taskRunner,
                      skiagm::GMRegistry::Factory gmFactory,
-                     const Expectations& expectations,
                      SkColorType colorType)
     : CpuTask(reporter, taskRunner)
     , fGMFactory(gmFactory)
     , fGM(fGMFactory(NULL))
     , fName(UnderJoin(fGM->getName(), config))
-    , fExpectations(expectations)
     , fColorType(colorType)
     {}
 
@@ -32,8 +29,6 @@ void CpuGMTask::draw() {
     canvas.flush();
 
 #define SPAWN(ChildTask, ...) this->spawnChild(SkNEW_ARGS(ChildTask, (*this, __VA_ARGS__)))
-    SPAWN(ExpectationsTask, fExpectations, bm);
-
     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kInProcess_Mode);
     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kCrossProcess_Mode);
     SPAWN(PipeTask, fGMFactory(NULL), bm, PipeTask::kSharedAddress_Mode);