diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index 3a5f926a8ac..fdea3ef43d0 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -686,7 +686,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
 
   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/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index 90ee214c956..17b388e4a67 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -897,8 +897,8 @@ static PRBool ValueIncludes(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   while (kNullCh != *start) {
@@ -938,8 +938,8 @@ static PRBool ValueDashMatch(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   if (kNullCh != *start) {
@@ -1143,7 +1143,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
                     NS_MakeAbsoluteURL(docURL, base, href, absURLSpec);
                     NS_IF_RELEASE(docURL);
 
-                    linkHandler->GetLinkState(absURLSpec, linkState);
+                    linkHandler->GetLinkState(absURLSpec.GetUnicode(), linkState);
                   }
                 }
               }
diff --git a/mozilla/content/html/style/src/nsHTMLAttributes.cpp b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
index c6d0fafe931..32cdee8da03 100644
--- a/mozilla/content/html/style/src/nsHTMLAttributes.cpp
+++ b/mozilla/content/html/style/src/nsHTMLAttributes.cpp
@@ -487,7 +487,7 @@ static void ParseClasses(const nsString& aClassString, nsClassList** aClassList)
   nsAutoString  classStr(aClassString);  // copy to work buffer
   classStr.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
   PRUnichar* end   = start;
 
   while (kNullCh != *start) {
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index f1e0768a806..1b45c3980fc 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -464,7 +464,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
                 NS_IF_RELEASE(docURL);
 
                 nsLinkState  state;
-                if (NS_OK == linkHandler->GetLinkState(absURLSpec, state)) {
+                if (NS_OK == linkHandler->GetLinkState(absURLSpec.GetUnicode(), state)) {
                   switch (state) {
                     case eLinkState_Unvisited:
                       if (nsnull != mLinkRule) {
diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp
index 3a5f926a8ac..fdea3ef43d0 100644
--- a/mozilla/layout/html/style/src/nsCSSParser.cpp
+++ b/mozilla/layout/html/style/src/nsCSSParser.cpp
@@ -686,7 +686,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
 
   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/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
index 90ee214c956..17b388e4a67 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
@@ -897,8 +897,8 @@ static PRBool ValueIncludes(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   while (kNullCh != *start) {
@@ -938,8 +938,8 @@ static PRBool ValueDashMatch(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   if (kNullCh != *start) {
@@ -1143,7 +1143,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
                     NS_MakeAbsoluteURL(docURL, base, href, absURLSpec);
                     NS_IF_RELEASE(docURL);
 
-                    linkHandler->GetLinkState(absURLSpec, linkState);
+                    linkHandler->GetLinkState(absURLSpec.GetUnicode(), linkState);
                   }
                 }
               }
diff --git a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
index c6d0fafe931..32cdee8da03 100644
--- a/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLAttributes.cpp
@@ -487,7 +487,7 @@ static void ParseClasses(const nsString& aClassString, nsClassList** aClassList)
   nsAutoString  classStr(aClassString);  // copy to work buffer
   classStr.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr;
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)classStr.GetUnicode();
   PRUnichar* end   = start;
 
   while (kNullCh != *start) {
diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
index f1e0768a806..1b45c3980fc 100644
--- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
@@ -464,7 +464,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
                 NS_IF_RELEASE(docURL);
 
                 nsLinkState  state;
-                if (NS_OK == linkHandler->GetLinkState(absURLSpec, state)) {
+                if (NS_OK == linkHandler->GetLinkState(absURLSpec.GetUnicode(), state)) {
                   switch (state) {
                     case eLinkState_Unvisited:
                       if (nsnull != mLinkRule) {
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index 3a5f926a8ac..fdea3ef43d0 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -686,7 +686,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
 
   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/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index 90ee214c956..17b388e4a67 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -897,8 +897,8 @@ static PRBool ValueIncludes(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   while (kNullCh != *start) {
@@ -938,8 +938,8 @@ static PRBool ValueDashMatch(const nsString& aValueList, const nsString& aValue,
 
   valueList.Append(kNullCh);  // put an extra null at the end
 
-  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue;
-  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList;
+  PRUnichar* value = (PRUnichar*)(const PRUnichar*)aValue.GetUnicode();
+  PRUnichar* start = (PRUnichar*)(const PRUnichar*)valueList.GetUnicode();
   PRUnichar* end   = start;
 
   if (kNullCh != *start) {
@@ -1143,7 +1143,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
                     NS_MakeAbsoluteURL(docURL, base, href, absURLSpec);
                     NS_IF_RELEASE(docURL);
 
-                    linkHandler->GetLinkState(absURLSpec, linkState);
+                    linkHandler->GetLinkState(absURLSpec.GetUnicode(), linkState);
                   }
                 }
               }
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index f1e0768a806..1b45c3980fc 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -464,7 +464,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
                 NS_IF_RELEASE(docURL);
 
                 nsLinkState  state;
-                if (NS_OK == linkHandler->GetLinkState(absURLSpec, state)) {
+                if (NS_OK == linkHandler->GetLinkState(absURLSpec.GetUnicode(), state)) {
                   switch (state) {
                     case eLinkState_Unvisited:
                       if (nsnull != mLinkRule) {