DM: Add support for reading a directory of images with --expectations (-r).

dm/DMCpuTask.h

Index: dm/DMCpuTask.h
diff --git a/dm/DMCpuTask.h b/dm/DMCpuTask.h
index 998ed7ba4d13fec632597701c49f6cefaa4f211b..c1ee7152c9faac7c697be355787e4021ce97781c 100644
--- a/dm/DMCpuTask.h
+++ b/dm/DMCpuTask.h
@@ -1,6 +1,7 @@
 #ifndef DMCpuTask_DEFINED
 #define DMCpuTask_DEFINED
 
+#include "DMExpectations.h"
 #include "DMReporter.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
@@ -8,12 +9,9 @@
 #include "SkString.h"
 #include "SkTemplates.h"
 #include "gm.h"
-#include "gm_expectations.h"
 
 // This is the main entry point for drawing GMs with the CPU.  Commandline
 // flags control whether this kicks off various comparison tasks when done.
-// Currently:
-//   --replay: spawn a DMReplayTask to record into a picture, draw the picture, and compare.
 
 namespace DM {
 
@@ -22,7 +20,7 @@ public:
     CpuTask(const char* name,
             Reporter*,
             TaskRunner*,
-            const skiagm::ExpectationsSource&,
+            const Expectations&,
             skiagm::GMRegistry::Factory,
             SkBitmap::Config);
 
@@ -35,7 +33,7 @@ private:
     skiagm::GMRegistry::Factory fGMFactory;
     SkAutoTDelete<skiagm::GM> fGM;
     const SkString fName;
-    const skiagm::Expectations fExpectations;
+    const Expectations& fExpectations;
     const SkBitmap::Config fConfig;
 };