Revert of Create SkColorSpaceXform to handle color conversions

src/codec/SkJpegCodec.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkJpegCodec_DEFINED
 #define SkJpegCodec_DEFINED
 
@@ skipping 40 matching lines @@
     Result onGetYUV8Planes(const SkYUVSizeInfo& sizeInfo, void* planes[3]) override;
 
     SkEncodedFormat onGetEncodedFormat() const override {
         return kJPEG_SkEncodedFormat;
     }
 
     bool onRewind() override;
 
     bool onDimensionsSupported(const SkISize&) override;
 
-    sk_sp<SkData> getICCData() const override { return fICCData; }
-
 private:
 
     /*
      * Read enough of the stream to initialize the SkJpegCodec.
      * Returns a bool representing success or failure.
      *
      * @param codecOut
      * If this returns true, and codecOut was not nullptr,
      * codecOut will be set to a new SkJpegCodec.
      *
@@ skipping 14 matching lines @@
     /*
      * Creates an instance of the decoder
      * Called only by NewFromStream
      *
      * @param info contains properties of the encoded data
      * @param stream the encoded image data
      * @param decoderMgr holds decompress struct, src manager, and error manager
      *                   takes ownership
      */
     SkJpegCodec(int width, int height, const SkEncodedInfo& info, SkStream* stream,
-            JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin,
-            sk_sp<SkData> iccData);
+            JpegDecoderMgr* decoderMgr, sk_sp<SkColorSpace> colorSpace, Origin origin);
 
     /*
      * Checks if the conversion between the input image and the requested output
      * image has been implemented
      * Sets the output color space
      */
     bool setOutputColorSpace(const SkImageInfo& dst);
 
     // scanline decoding
     void initializeSwizzler(const SkImageInfo& dstInfo, const Options& options);
@@ skipping 10 matching lines @@
 
     // scanline decoding
     SkAutoTMalloc<uint8_t>     fStorage;    // Only used if sampling is needed
     uint8_t*                   fSrcRow;     // Only used if sampling is needed
     // libjpeg-turbo provides some subsetting.  In the case that libjpeg-turbo
     // cannot take the exact the subset that we need, we will use the swizzler
     // to further subset the output from libjpeg-turbo.
     SkIRect                    fSwizzlerSubset;
     SkAutoTDelete<SkSwizzler>  fSwizzler;
     
-    sk_sp<SkData>              fICCData;
-
     typedef SkCodec INHERITED;
 };
 
 #endif