Updates to skimage tool to use it for testing.

include/images/SkImageDecoder.h

Index: include/images/SkImageDecoder.h
diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h
index 38e77f4df765e7139f0f2507f57fbd4e0c00ae23..0aed83987b416291a04a346bb8eff67303fa0af7 100644
--- a/include/images/SkImageDecoder.h
+++ b/include/images/SkImageDecoder.h
@@ -26,7 +26,6 @@ class SkImageDecoder {
 public:
     virtual ~SkImageDecoder();
 
-    // Should be consistent with sFormatName
     enum Format {
         kUnknown_Format,
         kBMP_Format,
@@ -41,7 +40,8 @@ public:
     };
 
     /** Return the format of image this decoder can decode. If this decoder can decode multiple
-        formats, kUnknown_Format will be returned.
+        formats, returns the format of the data that was most recently decoded successfully. Can
+        return kUnknown_Format.
     */
     virtual Format getFormat() const;
 
@@ -416,13 +416,6 @@ private:
     mutable bool            fShouldCancelDecode;
     bool                    fPreferQualityOverSpeed;
 
-    /** Contains the image format name.
-     *  This should be consistent with Format.
-     *
-     *  The format name gives a more meaningful error message than enum.
-     */
-    static const char* sFormatName[];
-
     // illegal
     SkImageDecoder(const SkImageDecoder&);
     SkImageDecoder& operator=(const SkImageDecoder&);