diff --git a/mozilla/netwerk/util/public/nsNeckoUtil.h b/mozilla/netwerk/util/public/nsNeckoUtil.h
index 85442b2f187..2ab6d29939c 100644
--- a/mozilla/netwerk/util/public/nsNeckoUtil.h
+++ b/mozilla/netwerk/util/public/nsNeckoUtil.h
@@ -24,7 +24,7 @@
 #include "nsIInputStream.h"
 #include "nsIStreamListener.h"
 #include "nsIEventSinkGetter.h"
-#include "nsString2.h"
+#include "nsString.h"
 
 // Warning: These functions should NOT be defined with NS_NET because
 // the intention is that they'll be linked with the library/DLL that 
@@ -34,7 +34,7 @@ extern nsresult
 NS_NewURI(nsIURI* *result, const char* spec, nsIURI* baseURI = nsnull);
 
 extern nsresult
-NS_NewURI(nsIURI* *result, nsString2& spec, nsIURI* baseURI = nsnull);
+NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI = nsnull);
 
 extern nsresult
 NS_OpenURI(nsIURI* uri, nsIInputStream* *result);
@@ -46,6 +46,6 @@ extern nsresult
 NS_MakeAbsoluteURI(const char* spec, nsIURI* baseURI, char* *result);
 
 extern nsresult
-NS_MakeAbsoluteURI(nsString2& spec, nsIURI* baseURI, nsString2& result);
+NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result);
 
 #endif // nsNeckoUtil_h__
diff --git a/mozilla/netwerk/util/src/nsNeckoUtil.cpp b/mozilla/netwerk/util/src/nsNeckoUtil.cpp
index 50e0b209995..ad8ff637604 100644
--- a/mozilla/netwerk/util/src/nsNeckoUtil.cpp
+++ b/mozilla/netwerk/util/src/nsNeckoUtil.cpp
@@ -35,7 +35,7 @@ NS_NewURI(nsIURI* *result, const char* spec, nsIURI* baseURI)
 }
 
 nsresult
-NS_NewURI(nsIURI* *result, nsString2& spec, nsIURI* baseURI)
+NS_NewURI(nsIURI* *result, const nsString& spec, nsIURI* baseURI)
 {
     char* specStr = spec.ToNewCString();
     nsresult rv = NS_NewURI(result, specStr, baseURI);
@@ -92,7 +92,7 @@ NS_MakeAbsoluteURI(const char* spec, nsIURI* baseURI, char* *result)
 }
 
 nsresult
-NS_MakeAbsoluteURI(nsString2& spec, nsIURI* baseURI, nsString2& result)
+NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result)
 {
     char* specStr = spec.ToNewCString();
     char* resultStr;