Bug 492225. Remove nsUTF8Utils dependency from nsWIndowsWMain. r=bsmedberg

toolkit/xre/nsWindowsWMain.cpp

@@ -6,8 +6,6 @@
 #error This file only makes sense on Windows.
 #endif
 
-#include "nsUTF8Utils.h"
-
 #ifdef __MINGW32__
 
 /* MingW currently does not implement a wide version of the
@@ -32,6 +30,7 @@ int main(int argc, char **argv)
 }
 #endif /* __MINGW32__ */
 
+#include <windows.h>
 #define main NS_internal_main
 
 int main(int argc, char **argv);
@@ -45,9 +44,7 @@ AllocConvertUTF16toUTF8(const WCHAR *arg)
   if (!s)
     return NULL;
 
-  ConvertUTF16toUTF8 convert(s);
-  convert.write(arg, len);
-  convert.write_terminator();
+  WideCharToMultiByte(CP_UTF8, 0, arg, len, s, len * 3 + 1, 0, 0);
   return s;
 }