Remove UEscape decoder/encoder. Bug 350830, r=jshin, sr=dveditz

intl/uconv/src/charsetData.properties

@@ -53,7 +53,6 @@
 
 t.61-8bit.notForBrowser             = true
 x-imap4-modified-utf7.notForBrowser = true
-x-u-escaped.notForBrowser           = true
 windows-936.notForBrowser           = true
 us-ascii.notForBrowser                  = true
 x-obsoleted-euc-jp.notForBrowser        = true
@@ -69,7 +68,6 @@ iso-8859-8-e.notForBrowser              = true
 t.61-8bit.notForOutgoing             = true
 utf-7.notForOutgoing                 = true
 x-imap4-modified-utf7.notForOutgoing = true
-x-u-escaped.notForOutgoing           = true
 windows-936.notForOutgoing           = true
 us-ascii.notForOutgoing                  = true
 x-obsoleted-euc-jp.notForOutgoing        = true

intl/uconv/src/charsetalias.properties

@@ -154,7 +154,6 @@ iso-10646-ucs-4=UTF-32BE
 x-iso-10646-ucs-4-be=UTF-32BE
 x-iso-10646-ucs-4-le=UTF-32LE
 x-user-defined=x-user-defined
-x-u-escaped=x-u-escaped
 x-johab=x-johab
 x-windows-949=x-windows-949
 #

intl/uconv/src/nsUConvModule.cpp

@@ -82,8 +82,6 @@
 // ucvlatin
 #include "nsUCvLatinCID.h"
 #include "nsUCvLatinDll.h"
-#include "nsUEscapeToUnicode.h"
-#include "nsUnicodeToUEscape.h"
 #include "nsAsciiToUnicode.h"
 #include "nsISO88592ToUnicode.h"
 #include "nsISO88593ToUnicode.h"
@@ -329,7 +327,6 @@ NS_UCONV_REG_UNREG("UTF-8", NS_UTF8TOUNICODE_CID, NS_UNICODETOUTF8_CID)
 
   // ucvlatin
 NS_UCONV_REG_UNREG("us-ascii", NS_ASCIITOUNICODE_CID, NS_UNICODETOASCII_CID)
-NS_UCONV_REG_UNREG("x-u-escaped", NS_UESCAPETOUNICODE_CID, NS_UNICODETOUESCAPE_CID)
 NS_UCONV_REG_UNREG("ISO-8859-2", NS_ISO88592TOUNICODE_CID, NS_UNICODETOISO88592_CID)
 NS_UCONV_REG_UNREG("ISO-8859-3", NS_ISO88593TOUNICODE_CID, NS_UNICODETOISO88593_CID)
 NS_UCONV_REG_UNREG("ISO-8859-4", NS_ISO88594TOUNICODE_CID, NS_UNICODETOISO88594_CID)
@@ -493,8 +490,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16BEToUnicode)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF16LEToUnicode)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32BEToUnicode)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUTF32LEToUnicode)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUEscape)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsUEscapeToUnicode)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF7)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMUTF7)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToUTF16BE)
@@ -812,11 +807,6 @@ static const nsModuleComponentInfo components[] =
     NS_UNICODEDECODER_CONTRACTID_BASE "us-ascii",
     nsAsciiToUnicodeConstructor ,
   },
-  { 
-    DECODER_NAME_BASE "x-u-escaped" , NS_UESCAPETOUNICODE_CID, 
-    NS_UNICODEDECODER_CONTRACTID_BASE "x-u-escaped",
-    nsUEscapeToUnicodeConstructor ,
-  },
   { 
     DECODER_NAME_BASE "ISO-8859-2" , NS_ISO88592TOUNICODE_CID, 
     NS_UNICODEDECODER_CONTRACTID_BASE "ISO-8859-2",
@@ -1122,11 +1112,6 @@ static const nsModuleComponentInfo components[] =
     NS_UNICODEENCODER_CONTRACTID_BASE "us-ascii",
     nsUnicodeToAsciiConstructor, 
   },
-  { 
-    ENCODER_NAME_BASE "x-u-escaped" , NS_UNICODETOUESCAPE_CID, 
-    NS_UNICODEENCODER_CONTRACTID_BASE "x-u-escaped",
-    nsUnicodeToUEscapeConstructor, 
-  },
   { 
     ENCODER_NAME_BASE "ISO-8859-2" , NS_UNICODETOISO88592_CID, 
     NS_UNICODEENCODER_CONTRACTID_BASE "ISO-8859-2",

intl/uconv/ucvlatin/Makefile.in

@@ -53,7 +53,6 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= \
-		nsUEscapeToUnicode.cpp \
 		nsAsciiToUnicode.cpp \
 		nsISO88592ToUnicode.cpp \
 		nsISO88593ToUnicode.cpp \
@@ -114,7 +113,6 @@ CPPSRCS		= \
 		nsUTF32ToUnicode.cpp \
 		nsT61ToUnicode.cpp \
 		nsUserDefinedToUnicode.cpp \
-		nsUnicodeToUEscape.cpp \
 		nsUnicodeToAscii.cpp \
 		nsUnicodeToISO88592.cpp \
 		nsUnicodeToISO88593.cpp \

intl/uconv/ucvlatin/nsUCvLatinCID.h

@@ -617,14 +617,6 @@
 #define NS_UNICODETOTIS620WIN_CID \
   { 0x4f26b731, 0x46cb, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
-// {319FF9C2-51D2-11d3-B3C3-00805F8A6670}
-#define NS_UESCAPETOUNICODE_CID \
-  { 0x319ff9c2, 0x51d2, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
-// {319FF9C3-51D2-11d3-B3C3-00805F8A6670}
-#define NS_UNICODETOUESCAPE_CID \
-  { 0x319ff9c3, 0x51d2, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
 #ifdef MOZ_EXTRA_X11CONVERTERS
 // {49B38F11-6193-11d3-B3C5-00805F8A6670}
 #define NS_UNICODETOLANGBOXARABIC8_CID \