Revert of Create SkColorSpaceXform to handle color conversions

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 706 matching lines @@
         if (ext && brd_supported(ext+1)) {
             push_brd_srcs(image);
         }
     }
 
     SkTArray<SkString> colorImages;
     if (!CollectImages(FLAGS_colorImages, &colorImages)) {
         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;
 }
 
 static void push_sink(const SkCommandLineConfig& config, Sink* s) {
     SkAutoTDelete<Sink> sink(s);
 
     // Try a simple Src as a canary.  If it fails, skip this sink.
     struct : public Src {
@@ skipping 640 matching lines @@
 #endif
 }
 } // namespace skiatest
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif