Remove expectations / -r from DM entirely.

dm/DMExpectationsTask.h

Index: dm/DMExpectationsTask.h
diff --git a/dm/DMExpectationsTask.h b/dm/DMExpectationsTask.h
deleted file mode 100644
index 7000de4b68e46ef7381f73eca105a24be338eca8..0000000000000000000000000000000000000000
--- a/dm/DMExpectationsTask.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef DMExpectationsTask_DEFINED
-#define DMExpectationsTask_DEFINED
-
-#include "DMExpectations.h"
-#include "DMTask.h"
-#include "SkBitmap.h"
-#include "SkString.h"
-
-namespace DM {
-
-// ExpectationsTask compares an SkBitmap against some Expectations.
-// Moving this off the GPU threadpool is a nice (~30%) runtime win.
-class ExpectationsTask : public CpuTask {
-public:
-    ExpectationsTask(const Task& parent, const Expectations&, SkBitmap);
-
-    virtual void draw() SK_OVERRIDE;
-    virtual bool shouldSkip() const SK_OVERRIDE { return false; }
-    virtual SkString name() const SK_OVERRIDE { return fName; }
-
-private:
-    const SkString fName;
-    const Expectations& fExpectations;
-    const SkBitmap fBitmap;
-};
-
-}  // namespace DM
-
-#endif  // DMExpectationsTask_DEFINED