diff --git a/mozilla/intl/uconv/tests/nsTestUConv.cpp b/mozilla/intl/uconv/tests/nsTestUConv.cpp
index 748a43495cc..6c4f729f367 100644
--- a/mozilla/intl/uconv/tests/nsTestUConv.cpp
+++ b/mozilla/intl/uconv/tests/nsTestUConv.cpp
@@ -289,7 +289,7 @@ nsresult testStressDecoder(nsIUnicodeDecoder * aDec,
 
   // get estimated length
   PRInt32 estimatedLength;
-  res = aDec->Length(aSrc, 0, aSrcLength, &estimatedLength);
+  res = aDec->GetMaxLength(aSrc, aSrcLength, &estimatedLength);
   if (NS_FAILED(res)) {
     printf("ERROR at %s.stress.Length() code=0x%x.\n",aTestName,res);
     return res;
diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.cpp
index 9e8558f1d43..bfe644efd5e 100644
--- a/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.cpp
+++ b/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.h b/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.h
index 7db5556bb08..27956bfad7d 100644
--- a/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.h
+++ b/mozilla/intl/uconv/ucvcn/nsUCvCnSupport.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaSupport.cpp b/mozilla/intl/uconv/ucvja/nsUCvJaSupport.cpp
index f2d21f619a0..4e71662e3af 100644
--- a/mozilla/intl/uconv/ucvja/nsUCvJaSupport.cpp
+++ b/mozilla/intl/uconv/ucvja/nsUCvJaSupport.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaSupport.h b/mozilla/intl/uconv/ucvja/nsUCvJaSupport.h
index cd7373e5895..30a4dcd2650 100644
--- a/mozilla/intl/uconv/ucvja/nsUCvJaSupport.h
+++ b/mozilla/intl/uconv/ucvja/nsUCvJaSupport.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/intl/uconv/ucvko/nsUCvKOSupport.cpp b/mozilla/intl/uconv/ucvko/nsUCvKOSupport.cpp
index 22abc411c62..2514c47f519 100644
--- a/mozilla/intl/uconv/ucvko/nsUCvKOSupport.cpp
+++ b/mozilla/intl/uconv/ucvko/nsUCvKOSupport.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvko/nsUCvKOSupport.h b/mozilla/intl/uconv/ucvko/nsUCvKOSupport.h
index ac09d8059f1..33a318de4be 100644
--- a/mozilla/intl/uconv/ucvko/nsUCvKOSupport.h
+++ b/mozilla/intl/uconv/ucvko/nsUCvKOSupport.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp
index 8320c00ccbc..f5bc6f07bc1 100644
--- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp
+++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h
index 0f12e8d60e3..a48bfbaf827 100644
--- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h
+++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinSupport.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.cpp b/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.cpp
index c63990dc495..8ff61213c83 100644
--- a/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.cpp
+++ b/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.h b/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.h
index f5ad5a024dd..8c9397277bc 100644
--- a/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.h
+++ b/mozilla/intl/uconv/ucvtw/nsUCvTWSupport.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------
diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.cpp b/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.cpp
index 6b617c93fb9..9e23bbc251c 100644
--- a/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.cpp
+++ b/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.cpp
@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 
diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.h b/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.h
index 2169acb586e..bf5ab58453f 100644
--- a/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.h
+++ b/mozilla/intl/uconv/ucvtw2/nsUCvTW2Support.h
@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------