Init charset utils if they are not initted yet - Firefox bringup

git-svn-id: svn://10.0.0.236/trunk@157024 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/xpcom/io/nsNativeCharsetUtils.cpp

@@ -949,6 +949,7 @@ NS_ShutdownNativeCharsetUtils()
 #include <uconv.h>
 #include "nsAString.h"
 #include <ulserrno.h>
+#include "nsNativeCharsetUtils.h"
 
 static UconvObject UnicodeConverter = NULL;
 
@@ -972,6 +973,9 @@ NS_CopyNativeToUnicode(const nsACString &input, nsAString  &output)
     size_t cSubs = 0;
     size_t resultLeft = resultLen;
 
+    if (!UnicodeConverter)
+      NS_StartupNativeCharsetUtils();
+
     int unirc = ::UniUconvToUcs(UnicodeConverter, (void**)&inputStr, &inputLen,
                                 &result, &resultLeft, &cSubs);
 
@@ -1008,6 +1012,9 @@ NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
 
     size_t cSubs = 0;
     size_t resultLeft = resultLen;
+
+    if (!UnicodeConverter)
+      NS_StartupNativeCharsetUtils();
   
     int unirc = ::UniUconvFromUcs(UnicodeConverter, &inputStr, &inputLen,
                                   (void**)&result, &resultLeft, &cSubs);