diff --git a/mozilla/browser/components/bookmarks/public/nsIBookmarksService.idl b/mozilla/browser/components/bookmarks/public/nsIBookmarksService.idl
index 6a72920d583..b0fc11f37f8 100644
--- a/mozilla/browser/components/bookmarks/public/nsIBookmarksService.idl
+++ b/mozilla/browser/components/bookmarks/public/nsIBookmarksService.idl
@@ -62,12 +62,12 @@ interface nsIBookmarksService : nsISupports
                                            in long aIndex);
 
     nsIRDFResource createBookmark(in wstring aName,
-                                  in string aURL,
+                                  in wstring aURL,
                                   in wstring aShortcutURL,
                                   in wstring aDescription,
                                   in wstring aDocCharSet);
     nsIRDFResource createBookmarkInContainer(in wstring aName,
-                                             in string aURL,
+                                             in wstring aURL,
                                              in wstring aShortcutURL,
                                              in wstring aDescription,
                                              in wstring aDocCharSet, 
@@ -95,7 +95,7 @@ interface nsIBookmarksService : nsISupports
     readonly attribute nsITransactionManager transactionManager;
 
     //XXXpch: to be removed.
-    void addBookmarkImmediately(in string aURI, in wstring aTitle, in long bmType, in wstring docCharset);
+    void addBookmarkImmediately(in wstring aURI, in wstring aTitle, in long bmType, in wstring docCharset);
     boolean isBookmarked(in string aURL);
 
 };
diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
index 429a59e3baa..cb484b3d75a 100644
--- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
@@ -2515,7 +2515,7 @@ nsBookmarksService::GetURLFromResource(nsIRDFResource* aResource,
 
 NS_IMETHODIMP
 nsBookmarksService::CreateBookmark(const PRUnichar* aName,
-                                   const char* aURL, 
+                                   const PRUnichar* aURL, 
                                    const PRUnichar* aShortcutURL,
                                    const PRUnichar* aDescription,
                                    const PRUnichar* aDocCharSet, 
@@ -2552,7 +2552,7 @@ nsBookmarksService::CreateBookmark(const PRUnichar* aName,
 
     // Resource: URL
     nsAutoString url;
-    url.AssignWithConversion(aURL);
+    url.Assign(aURL);
     nsCOMPtr<nsIRDFLiteral> urlLiteral;
     rv = gRDF->GetLiteral(url.get(), getter_AddRefs(urlLiteral));
     if (NS_FAILED(rv)) 
@@ -2614,7 +2614,7 @@ nsBookmarksService::CreateBookmark(const PRUnichar* aName,
 
 NS_IMETHODIMP
 nsBookmarksService::CreateBookmarkInContainer(const PRUnichar* aName,
-                                              const char* aURL, 
+                                              const PRUnichar* aURL, 
                                               const PRUnichar* aShortcutURL, 
                                               const PRUnichar* aDescription, 
                                               const PRUnichar* aDocCharSet, 
@@ -2782,7 +2782,7 @@ nsBookmarksService::GetParentChain(nsIRDFResource* aSource, nsIArray** aParents)
 //to be removed RSN
 
 NS_IMETHODIMP
-nsBookmarksService::AddBookmarkImmediately(const char *aURI,
+nsBookmarksService::AddBookmarkImmediately(const PRUnichar *aURI,
                                            const PRUnichar *aTitle, 
                                            PRInt32 aBookmarkType, 
                                            const PRUnichar *aCharset)