bug 183156 remove *UCS2* functions, replacing them with *UTF16* ones

r+sr=darin

java/webclient/src_moz/NavigationImpl.cpp

@@ -181,7 +181,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_Navigatio
 
     urlChars         = (PRUnichar *) ::util_GetStringChars(env, absoluteURL);
     urlLen           = (PRInt32) ::util_GetStringLength(env, absoluteURL);
-    NS_ConvertUCS2toUTF8 uriACString(urlChars);
+    NS_ConvertUTF16toUTF8 uriACString(urlChars);
 
     if (::util_ExceptionOccurred(env)) {
         ::util_ThrowExceptionToJava(env, "nativePost Exception: unable to extract Java string");

java/webclient/src_moz/ns_util.cpp

@@ -171,7 +171,7 @@ nsresult util_GetLocaleString(const char *aKey, PRUnichar **aResult)
   rv = stringService->CreateBundle(kCommonDialogsProperties, getter_AddRefs(stringBundle));
   if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
 
-  rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).get(), aResult);
+  rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUTF16(aKey).get(), aResult);
 
   return rv;
 

java/webclient/src_moz/ns_util_export.cpp

@@ -41,7 +41,7 @@ JNIEXPORT jint JNICALL util_StoreClassMapping(const char* jniClassName,
         }
     }
 
-    NS_ConvertASCIItoUCS2 keyString(jniClassName);
+    NS_ConvertASCIItoUTF16 keyString(jniClassName);
     nsStringKey key(keyString);
     gClassMappingTable->Put(&key, yourClassType);
 
@@ -56,7 +56,7 @@ JNIEXPORT jclass JNICALL util_GetClassMapping(const char* jniClassName)
         return nsnull;
     }
 
-    NS_ConvertASCIItoUCS2 keyString(jniClassName);
+    NS_ConvertASCIItoUTF16 keyString(jniClassName);
     nsStringKey key(keyString);
     result = (jclass) gClassMappingTable->Get(&key);