Revert of Create SkColorSpaceXform to handle color conversions

dm/DM.cpp

Index: dm/DM.cpp
diff --git a/dm/DM.cpp b/dm/DM.cpp
index e17fd358d06ef4a489d941f74d2cc35d7bf851be..8ee2ea739f9dfc2da371dedb530f647c36c8acfe 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -724,15 +724,18 @@
         return false;
     }
 
+    // Load the dstSpace.  This particular dst is fairly similar to Adobe RGB.
+    SkAutoTUnref<SkData> data(SkData::NewFromFileName(
+            GetResourcePath("monitor_profiles/HP_ZR30w.icc").c_str()));
+    sk_sp<SkColorSpace> dstSpace = SkColorSpace::NewICC(data->data(), data->size());
+    SkASSERT(dstSpace);
+
     for (auto colorImage : colorImages) {
-        ColorCodecSrc* src = new ColorCodecSrc(colorImage, ColorCodecSrc::kBaseline_Mode);
+        ColorCodecSrc* src = new ColorCodecSrc(colorImage, ColorCodecSrc::kBaseline_Mode, nullptr);
         push_src("image", "color_codec_baseline", src);
 
-        src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_HPZR30w_Mode);
+        src = new ColorCodecSrc(colorImage, ColorCodecSrc::kDst_HPZR30w_Mode, dstSpace);
         push_src("image", "color_codec_HPZR30w", src);
-
-        src = new ColorCodecSrc(colorImage, ColorCodecSrc::kQCMS_HPZR30w_Mode);
-        push_src("image", "color_codec_QCMS_HPZR30w", src);
     }
 
     return true;