diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index cd8f0a4ff4a..6bda5ebf7b3 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -2675,14 +2675,13 @@ NS_IMETHODIMP nsDocShell::ShouldPersistInSessionHistory(nsIURI* aURI,
    nsXPIDLCString scheme;
    NS_ENSURE_SUCCESS(aURI->GetScheme(getter_Copies(scheme)), NS_ERROR_FAILURE);
    
-   nsAutoString schemeStr(scheme);
+   nsAutoString schemeStr; schemeStr.AssignWithConversion(scheme);
 
-   if(schemeStr.Equals("about"))
+   if(schemeStr.EqualsWithConversion("about"))
       {
       nsXPIDLCString path;
       NS_ENSURE_SUCCESS(aURI->GetPath(getter_Copies(path)), NS_ERROR_FAILURE);
-      nsAutoString pathStr(path);
-      if(pathStr.Equals("blank"))
+      if(nsCAutoString(path).Equals("blank"))
          return NS_OK;
       }
 
diff --git a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp
index 1dfde29f206..13207c19965 100644
--- a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp
+++ b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp
@@ -572,7 +572,7 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         if (NS_SUCCEEDED(rv)) {
           nsIDOMDocument* prop;
           if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop,
-                                                  kIDocumentIID, "Document",
+                                                  kIDocumentIID, NS_ConvertASCIItoUCS2("Document"),
                                                   cx, *vp)) {
             rv = NS_ERROR_DOM_NOT_OBJECT_ERR;
           }
diff --git a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp
index 74c3d371878..58c5c5fb976 100644
--- a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp
+++ b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp
@@ -409,7 +409,7 @@ HTMLOptionElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *
     return JS_FALSE;
   }
 
-  result = manager->LookupName("HTMLOptionElement", PR_TRUE, classID);
+  result = manager->LookupName(NS_ConvertASCIItoUCS2("HTMLOptionElement"), PR_TRUE, classID);
   if (NS_OK != result) {
     return JS_FALSE;
   }
diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
index 1048f8a71e8..213989e03b5 100644
--- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -637,7 +637,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration(
     nsCOMPtr<nsISupports> base;
     nsCOMPtr<nsIRegistryNode> node;
     char * name = NULL;
-    nsAutoString fullName(aAddPrefix);
+    nsAutoString fullName; fullName.AssignWithConversion(aAddPrefix);
     nsCOMPtr<nsIAtom> atom;
 
     res = components->CurrentItem(getter_AddRefs(base));
@@ -649,7 +649,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration(
     res = node->GetNameUTF8(&name);
     if (NS_FAILED(res)) goto done1;
 
-    fullName.Append(name);
+    fullName.AppendWithConversion(name);
     res = GetCharsetAtom(fullName.GetUnicode(), getter_AddRefs(atom));
     if (NS_FAILED(res)) goto done1;
 
@@ -736,7 +736,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration2(
 
     if (aDecoder) {
       if (!strcmp(dest, "Unicode")) {
-        fullName.Assign(src);
+        fullName.AssignWithConversion(src);
         res = GetCharsetAtom(fullName.GetUnicode(), getter_AddRefs(atom));
         if (NS_FAILED(res)) goto done1;
 
@@ -745,7 +745,7 @@ nsresult nsCharsetConverterManager::GetRegistryEnumeration2(
       }
     } else {
       if (!strcmp(src, "Unicode")) {
-        fullName.Assign(dest);
+        fullName.AssignWithConversion(dest);
         res = GetCharsetAtom(fullName.GetUnicode(), getter_AddRefs(atom));
         if (NS_FAILED(res)) goto done1;
 
@@ -923,7 +923,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetUnicodeDecoder(
   res = ((nsIAtom *) aCharset)->GetUnicode(&name);
   if (NS_FAILED(res)) return res;
 
-  nsAutoString progID(NS_UNICODEDECODER_PROGID_BASE);
+  nsAutoString progID; progID.AssignWithConversion(NS_UNICODEDECODER_PROGID_BASE);
   progID.Append(name);
   char buff[256];
   progID.ToCString(buff, 256);
@@ -948,7 +948,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetUnicodeEncoder(
   res = ((nsIAtom *) aCharset)->GetUnicode(&name);
   if (NS_FAILED(res)) return res;
 
-  nsAutoString progID(NS_UNICODEENCODER_PROGID_BASE);
+  nsAutoString progID; progID.AssignWithConversion(NS_UNICODEENCODER_PROGID_BASE);
   progID.Append(name);
   char buff[256];
   progID.ToCString(buff, 256);
@@ -1043,7 +1043,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetCharsetTitle(
   *aResult = NULL;
 
   nsresult res = NS_OK;
-  nsAutoString prop(".title");
+  nsAutoString prop; prop.AssignWithConversion(".title");
 
   if (mTitleBundle == NULL) {
     res = LoadExtensibleBundle(NS_TITLE_BUNDLE_REGISTRY_KEY, &mTitleBundle);
@@ -1103,7 +1103,7 @@ NS_IMETHODIMP nsCharsetConverterManager::GetCharsetLangGroup(
   *aResult = NULL;
 
   nsresult res = NS_OK;
-  nsAutoString prop(".LangGroup");
+  nsAutoString prop; prop.AssignWithConversion(".LangGroup");
 
   if (mDataBundle == NULL) {
     res = LoadExtensibleBundle(NS_DATA_BUNDLE_REGISTRY_KEY, &mDataBundle);