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

dm/DMGpuTask.h

Index: dm/DMGpuTask.h
diff --git a/dm/DMGpuTask.h b/dm/DMGpuTask.h
index 87c530b825a8bd431e025d02a74209646bef95f1..aa350c9d99946b8c2c26d0f2109e829e8ea4f270 100644
--- a/dm/DMGpuTask.h
+++ b/dm/DMGpuTask.h
@@ -1,6 +1,7 @@
 #ifndef DMGpuTask_DEFINED
 #define DMGpuTask_DEFINED
 
+#include "DMExpectations.h"
 #include "DMReporter.h"
 #include "DMTask.h"
 #include "DMTaskRunner.h"
@@ -9,7 +10,6 @@
 #include "SkString.h"
 #include "SkTemplates.h"
 #include "gm.h"
-#include "gm_expectations.h"
 
 // This is the main entry point for drawing GMs with the GPU.
 
@@ -20,7 +20,7 @@ public:
     GpuTask(const char* name,
             Reporter*,
             TaskRunner*,
-            const skiagm::ExpectationsSource&,
+            const Expectations&,
             skiagm::GMRegistry::Factory,
             SkBitmap::Config,
             GrContextFactory::GLContextType,
@@ -34,7 +34,7 @@ public:
 private:
     SkAutoTDelete<skiagm::GM> fGM;
     const SkString fName;
-    const skiagm::Expectations fExpectations;
+    const Expectations& fExpectations;
     const SkBitmap::Config fConfig;
     const GrContextFactory::GLContextType fContextType;
     const int fSampleCount;