diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index c7cc421371f..42721433dd0 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -2315,7 +2315,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData
   
   stringList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList.GetUnicode();
   PRUnichar* end   = start;
   PRUnichar* last  = start;
   PRUnichar  endCh;
@@ -3098,7 +3098,7 @@ static PRBool EnumerateMediaString(const nsString& aStringList, nsStringEnumFunc
 
   stringList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList.GetUnicode();
   PRUnichar* end   = start;
 
   while (running && (kNullCh != *start)) {
diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 549c3526b5f..2cab04d6602 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -352,7 +352,7 @@ NS_IMETHODIMP nsHTMLDocument::SetTitle(const nsString& aTitle)
         nsIWebShell* ws = nsnull;
         container->QueryInterface(kIWebShellIID, (void**) &ws);
         if (nsnull != ws) {
-          ws->SetTitle(aTitle);
+          ws->SetTitle(aTitle.GetUnicode());
           NS_RELEASE(ws);
         }
         NS_RELEASE(container);
diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index 43a805f7bf7..9f3dc45c610 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -689,7 +689,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
   
   nsString frameName;
   if (GetName(content, frameName)) {
-    mWebShell->SetName(frameName);
+    mWebShell->SetName(frameName.GetUnicode());
   }
 
   // If our container is a web-shell, inform it that it has a new
@@ -825,7 +825,7 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext&          aPresContext,
         nsString absURL;
         TempMakeAbsURL(content, url, absURL);
 
-        rv = mWebShell->LoadURL(absURL);  // URL string with a default nsnull value for post Data
+        rv = mWebShell->LoadURL(absURL.GetUnicode());  // URL string with a default nsnull value for post Data
       }
     } else {
       mCreatingViewer = PR_TRUE;
@@ -881,7 +881,7 @@ nsHTMLFrameInnerFrame::ReloadURL()
         nsString absURL;
         TempMakeAbsURL(content, url, absURL);
 
-        rv = mWebShell->LoadURL(absURL);  // URL string with a default nsnull value for post Data
+        rv = mWebShell->LoadURL(absURL.GetUnicode());  // URL string with a default nsnull value for post Data
       }
     } else {
       mCreatingViewer = PR_TRUE;
diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp
index 43a805f7bf7..9f3dc45c610 100644
--- a/mozilla/layout/html/document/src/nsFrameFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp
@@ -689,7 +689,7 @@ nsHTMLFrameInnerFrame::CreateWebShell(nsIPresContext& aPresContext,
   
   nsString frameName;
   if (GetName(content, frameName)) {
-    mWebShell->SetName(frameName);
+    mWebShell->SetName(frameName.GetUnicode());
   }
 
   // If our container is a web-shell, inform it that it has a new
@@ -825,7 +825,7 @@ nsHTMLFrameInnerFrame::Reflow(nsIPresContext&          aPresContext,
         nsString absURL;
         TempMakeAbsURL(content, url, absURL);
 
-        rv = mWebShell->LoadURL(absURL);  // URL string with a default nsnull value for post Data
+        rv = mWebShell->LoadURL(absURL.GetUnicode());  // URL string with a default nsnull value for post Data
       }
     } else {
       mCreatingViewer = PR_TRUE;
@@ -881,7 +881,7 @@ nsHTMLFrameInnerFrame::ReloadURL()
         nsString absURL;
         TempMakeAbsURL(content, url, absURL);
 
-        rv = mWebShell->LoadURL(absURL);  // URL string with a default nsnull value for post Data
+        rv = mWebShell->LoadURL(absURL.GetUnicode());  // URL string with a default nsnull value for post Data
       }
     } else {
       mCreatingViewer = PR_TRUE;
diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
index c7cc421371f..42721433dd0 100644
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@@ -2315,7 +2315,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData
   
   stringList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList.GetUnicode();
   PRUnichar* end   = start;
   PRUnichar* last  = start;
   PRUnichar  endCh;
@@ -3098,7 +3098,7 @@ static PRBool EnumerateMediaString(const nsString& aStringList, nsStringEnumFunc
 
   stringList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)stringList.GetUnicode();
   PRUnichar* end   = start;
 
   while (running && (kNullCh != *start)) {
diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
index 549c3526b5f..2cab04d6602 100644
--- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp
@@ -352,7 +352,7 @@ NS_IMETHODIMP nsHTMLDocument::SetTitle(const nsString& aTitle)
         nsIWebShell* ws = nsnull;
         container->QueryInterface(kIWebShellIID, (void**) &ws);
         if (nsnull != ws) {
-          ws->SetTitle(aTitle);
+          ws->SetTitle(aTitle.GetUnicode());
           NS_RELEASE(ws);
         }
         NS_RELEASE(container);
diff --git a/mozilla/layout/html/forms/src/nsFormFrame.cpp b/mozilla/layout/html/forms/src/nsFormFrame.cpp
index 9b3ad29a67c..2e764daf7ab 100644
--- a/mozilla/layout/html/forms/src/nsFormFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFormFrame.cpp
@@ -661,7 +661,7 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame)
 
       /* The postBuffer is now owned by the IPostData instance */
     }    
-    handler->OnLinkClick(mContent, eLinkVerb_Replace, absURLSpec, target, postData);
+    handler->OnLinkClick(mContent, eLinkVerb_Replace, absURLSpec.GetUnicode(), target.GetUnicode(), postData);
     NS_IF_RELEASE(postData);
     NS_RELEASE(handler);