change SkStreams to work with sk_sp<SkData> instead of SkData*

include/codec/SkAndroidCodec.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 SkAndroidCodec_DEFINED
 #define SkAndroidCodec_DEFINED
 
@@ skipping 19 matching lines @@
      *  SkCodec takes ownership of it, and will delete it when done with it.
      */
     static SkAndroidCodec* NewFromStream(SkStream*, SkPngChunkReader* = NULL);
 
     /**
      *  If this data represents an encoded image that we know how to decode,
      *  return an SkAndroidCodec that can decode it. Otherwise return NULL.
      *
      *  The SkPngChunkReader handles unknown chunks in PNGs.
      *  See SkCodec.h for more details.
-     *
-     *  Will take a ref if it returns a codec, else will not affect the data.
      */
-    static SkAndroidCodec* NewFromData(SkData*, SkPngChunkReader* = NULL);
+    static SkAndroidCodec* NewFromData(sk_sp<SkData>, SkPngChunkReader* = NULL);
+    static SkAndroidCodec* NewFromData(SkData* data, SkPngChunkReader* reader) {
+        return NewFromData(sk_ref_sp(data), reader);
+    }
 
     virtual ~SkAndroidCodec() {}
 
 
     const SkImageInfo& getInfo() const { return fInfo; }
 
     /**
      *  Format of the encoded data.
      */
     SkEncodedFormat getEncodedFormat() const { return fCodec->getEncodedFormat(); }
@@ skipping 201 matching lines @@
 
 private:
 
     // This will always be a reference to the info that is contained by the
     // embedded SkCodec.
     const SkImageInfo& fInfo;
 
     SkAutoTDelete<SkCodec> fCodec;
 };
 #endif // SkAndroidCodec_DEFINED