Revert of Sketch DM refactor.

dm/DMTestTask.h

+#ifndef DMTestTask_DEFINED
+#define DMTestTask_DEFINED
+
+#include "DMReporter.h"
+#include "DMJsonWriter.h"
+#include "DMTask.h"
+#include "DMTaskRunner.h"
+#include "SkString.h"
+#include "SkTemplates.h"
+#include "Test.h"
+
+// Runs a unit test.
+namespace DM {
+
+class TestReporter : public skiatest::Reporter {
+public:
+  TestReporter() {}
+
+  const SkTArray<SkString>& failures() const { return fFailures; }
+
+private:
+  bool allowExtendedTest() const SK_OVERRIDE;
+  bool verbose()           const SK_OVERRIDE;
+
+  void onReportFailed(const skiatest::Failure& failure) SK_OVERRIDE {
+      JsonWriter::AddTestFailure(failure);
+
+      SkString newFailure;
+      failure.getFailureString(&newFailure);
+      fFailures.push_back(newFailure);
+  }
+
+  SkTArray<SkString> fFailures;
+};
+
+class CpuTestTask : public CpuTask {
+public:
+    CpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
+
+    void draw() SK_OVERRIDE;
+    bool shouldSkip() const SK_OVERRIDE { return false; }
+    SkString name() const SK_OVERRIDE { return fName; }
+
+private:
+    TestReporter fTestReporter;
+    SkAutoTDelete<skiatest::Test> fTest;
+    const SkString fName;
+};
+
+class GpuTestTask : public GpuTask {
+public:
+    GpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
+
+    void draw(GrContextFactory*) SK_OVERRIDE;
+    bool shouldSkip() const SK_OVERRIDE;
+    SkString name() const SK_OVERRIDE { return fName; }
+
+private:
+    TestReporter fTestReporter;
+    SkAutoTDelete<skiatest::Test> fTest;
+    const SkString fName;
+};
+
+}  // namespace DM
+
+#endif // DMTestTask_DEFINED