diff --git a/mozilla/xpcom/string/public/nsTString.h b/mozilla/xpcom/string/public/nsTString.h
index 897f232ca53..d5b018ff9a8 100644
--- a/mozilla/xpcom/string/public/nsTString.h
+++ b/mozilla/xpcom/string/public/nsTString.h
@@ -403,10 +403,6 @@ class nsTString_CharT : public nsTSubstring_CharT
       NS_COM void AppendWithConversion( const nsTAString_IncompatibleCharT& aString );
       NS_COM void AppendWithConversion( const incompatible_char_type* aData, PRInt32 aLength=-1 );
 
-#ifdef CharT_is_PRUnichar
-      NS_COM void InsertWithConversion( const incompatible_char_type* aData, PRUint32 aOffset, PRInt32 aCount=-1 );
-#endif
-
         /**
          * Append the given integer to this string 
          */
diff --git a/mozilla/xpcom/string/src/nsStringObsolete.cpp b/mozilla/xpcom/string/src/nsStringObsolete.cpp
index 36168af6eee..131a03236dc 100644
--- a/mozilla/xpcom/string/src/nsStringObsolete.cpp
+++ b/mozilla/xpcom/string/src/nsStringObsolete.cpp
@@ -1205,20 +1205,6 @@ nsString::AppendWithConversion( const nsACString& aData )
   }
 
 
-  /**
-   * nsTString::InsertWithConversion
-   */
-
-void
-nsString::InsertWithConversion( const char* aData, PRUint32 aOffset, PRInt32 aCount )
-  {
-    if (aCount < 0)
-      aCount = nsCharTraits<char>::length(aData);
-
-    Insert(NS_ConvertASCIItoUTF16(aData), aOffset);
-  }
-
-
   /**
    * nsTString::AppendInt
    */
diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
index f156129935e..b28b47a15d0 100755
--- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -4066,9 +4066,9 @@ InternetSearchDataSource::SaveEngineInfoIntoGraph(nsIFile *file, nsIFile *icon,
 		getter_AddRefs(searchRes))))	return(rv);
 
 	// save the basename reference
-	if (basename.Length() > 0)
+	if (!basename.IsEmpty())
 	{
-		basename.InsertWithConversion(kURINC_SearchCategoryEngineBasenamePrefix, 0);
+		basename.Insert(NS_ConvertASCIItoUTF16(kURINC_SearchCategoryEngineBasenamePrefix), 0);
 
 		if (NS_FAILED(rv = gRDFService->GetUnicodeResource(basename,
 			getter_AddRefs(categoryRes))))	return(rv);