Remove image decoder and encoder autoregistration

src/images/SkImageDecoder_wbmp.cpp

Index: src/images/SkImageDecoder_wbmp.cpp
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index 7a6f76ed3463186b5a39890ed07598756e0af594..f4f9bf7e3c6251bc2be0519b53b9a867c6ab13d3 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -6,8 +6,7 @@
  * found in the LICENSE file.
  */
 
-
-#include "SkImageDecoder.h"
+#include "SkImageDecoder_wbmp.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkMath.h"
@@ -148,26 +147,15 @@ SkImageDecoder::Result SkWBMPImageDecoder::onDecode(SkStream* stream, SkBitmap*
     return kSuccess;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-DEFINE_DECODER_CREATOR(WBMPImageDecoder);
-///////////////////////////////////////////////////////////////////////////////
-
-static SkImageDecoder* sk_wbmp_dfactory(SkStreamRewindable* stream) {
-    wbmp_head   head;
-
-    if (head.init(stream)) {
-        return SkNEW(SkWBMPImageDecoder);
-    }
-    return NULL;
+SkImageDecoder* SkCreateWBMPImageDecoder(SkImageDecoder::Format format) {
+    SkASSERT(SkImageDecoder::kWBMP_Format == format);
+    return SkNEW(SkWBMPImageDecoder);
 }
 
-static SkImageDecoder::Format get_format_wbmp(SkStreamRewindable* stream) {
+SkImageDecoder::Format SkDetectFormatWBMPImageDecoder(SkStreamRewindable* stream) {
     wbmp_head head;
     if (head.init(stream)) {
         return SkImageDecoder::kWBMP_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
-
-static SkImageDecoder_DecodeReg gDReg(sk_wbmp_dfactory);
-static SkImageDecoder_FormatReg gFormatReg(get_format_wbmp);