Revert of Add SkEncodedInfo to report properties of encoded image data

include/codec/SkCodec.h

Index: include/codec/SkCodec.h
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index 50875e46c4a42cfbef1d204a0af3bfa01a74b38c..629274d21ccacc734259c981b670d60cf1d37c5e 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -11,7 +11,6 @@
 #include "../private/SkTemplates.h"
 #include "SkColor.h"
 #include "SkEncodedFormat.h"
-#include "SkEncodedInfo.h"
 #include "SkImageInfo.h"
 #include "SkSize.h"
 #include "SkStream.h"
@@ -100,8 +99,6 @@
      *  Return the ImageInfo associated with this codec.
      */
     const SkImageInfo& getInfo() const { return fSrcInfo; }
-
-    const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; }
 
     /**
      *  Returns the color space associated with the codec.
@@ -514,9 +511,7 @@
     /**
      *  Takes ownership of SkStream*
      */
-    SkCodec(int width,
-            int height,
-            const SkEncodedInfo&,
+    SkCodec(const SkImageInfo&,
             SkStream*,
             sk_sp<SkColorSpace> = nullptr,
             Origin = kTopLeft_Origin);
@@ -647,7 +642,6 @@
     virtual int onOutputScanline(int inputScanline) const;
 
 private:
-    const SkEncodedInfo         fEncodedInfo;
     const SkImageInfo           fSrcInfo;
     SkAutoTDelete<SkStream>     fStream;
     bool                        fNeedsRewind;