diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index 09a842fb16f..1021e6540de 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -916,7 +916,23 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString);
+    return result;
+  }
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString, PRUint32 aLength )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString, aLength);
+    return result;
+  }
 
 /***************************************************************
   The subsumestr class is very unusual. 
diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h
index 09a842fb16f..1021e6540de 100644
--- a/mozilla/xpcom/ds/nsString2.h
+++ b/mozilla/xpcom/ds/nsString2.h
@@ -916,7 +916,23 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString);
+    return result;
+  }
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString, PRUint32 aLength )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString, aLength);
+    return result;
+  }
 
 /***************************************************************
   The subsumestr class is very unusual. 
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index 09a842fb16f..1021e6540de 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -916,7 +916,23 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString);
+    return result;
+  }
 
+inline
+nsAutoString
+NS_ConvertToString( const char* aCString, PRUint32 aLength )
+  {
+    nsAutoString result;
+    result.AssignWithConversion(aCString, aLength);
+    return result;
+  }
 
 /***************************************************************
   The subsumestr class is very unusual.