Fix various SkColorSpace bugs

bench/ColorCodecBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "ColorCodecBench.h"
 #include "Resources.h"
 #include "SkCodec.h"
@@ skipping 122 matching lines @@
         dst = SkTAddOffset<void>(dst, fDstInfo.minRowBytes());
         src = SkTAddOffset<void>(src, fSrcInfo.minRowBytes());
     }
 }
 #endif
 
 void ColorCodecBench::onDelayedSetup() {
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(fEncoded.get()));
     fSrcData = codec->getICCData();
     sk_sp<SkData> dstData = SkData::MakeFromFileName(
-            GetResourcePath("monitor_profiles/HP_ZR30w.icc").c_str());
+            GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str());
     SkASSERT(dstData);
 
     fDstSpace = nullptr;
 #if defined(SK_TEST_QCMS)
     if (FLAGS_qcms) {
         fDstSpaceQCMS.reset(FLAGS_srgb ?
                 qcms_profile_sRGB() :
                 qcms_profile_from_memory(dstData->data(), dstData->size()));
         SkASSERT(fDstSpaceQCMS);
 
@@ skipping 51 matching lines @@
 #endif
         {
             if (FLAGS_xform_only) {
                 this->xformOnly();
             } else {
                 this->decodeAndXform();
             }
         }
     }
 }