Remove image decoder and encoder autoregistration

src/ports/SkImageDecoder_WIC.cpp

Index: src/ports/SkImageDecoder_WIC.cpp
diff --git a/src/ports/SkImageDecoder_WIC.cpp b/src/ports/SkImageDecoder_WIC.cpp
index 3309af4685cc9652643065fa272b9d129b0a0431..a1ebb18df00c3a06ee6b2354612876e27147e529 100644
--- a/src/ports/SkImageDecoder_WIC.cpp
+++ b/src/ports/SkImageDecoder_WIC.cpp
@@ -437,7 +437,16 @@ bool SkImageEncoder_WIC::onEncode(SkWStream* stream
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
+SkImageDecoder::Format SkDetectFormatImageDecoder_WIC(SkStreamRewindable* stream) {
+    SkImageDecoder::Format format;
+    SkImageDecoder_WIC codec;
+    if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
+        format = SkImageDecoder::kUnknown_Format;
+    }
+    return format;
+}
+
+SkImageEncoder* SkCreateImageDecoder_WIC(SkImageEncoder::Type t) {
     switch (t) {
         case SkImageEncoder::kBMP_Type:
         case SkImageEncoder::kICO_Type:
@@ -450,15 +459,4 @@ static SkImageEncoder* sk_imageencoder_wic_factory(SkImageEncoder::Type t) {
     return SkNEW_ARGS(SkImageEncoder_WIC, (t));
 }
 
-static SkImageEncoder_EncodeReg gEReg(sk_imageencoder_wic_factory);
-
-static SkImageDecoder::Format get_format_wic(SkStreamRewindable* stream) {
-    SkImageDecoder::Format format;
-    SkImageDecoder_WIC codec;
-    if (!codec.decodeStream(stream, NULL, SkImageDecoder_WIC::kDecodeFormat_WICMode, &format)) {
-        format = SkImageDecoder::kUnknown_Format;
-    }
-    return format;
-}
 
-static SkImageDecoder_FormatReg gFormatReg(get_format_wic);