Remove dedicated TextCodecUTF16

third_party/WebKit/Source/wtf/text/TextCodecICU.cpp

 /*
  * Copyright (C) 2004, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 202 matching lines @@
     registrar("iso_8859-9", "windows-1254");
     registrar("iso_8859-15", "ISO-8859-15");
     registrar("koi8_r", "KOI8-R");
     registrar("x-cp1253", "windows-1253");
     registrar("x-cp1254", "windows-1254");
     registrar("x-cp1255", "windows-1255");
     registrar("x-cp1256", "windows-1256");
     registrar("x-cp1257", "windows-1257");
     registrar("x-cp1258", "windows-1258");
 #endif
+
+    // TODO(jshin): Move to ICU's data/mappings/convrtrs.txt aliases.
+    registrar("UTF-16", "utf-16le");
+    registrar("ISO-10646-UCS-2", "utf-16le");
+    registrar("UCS-2", "utf-16le");
+    registrar("Unicode", "utf-16le");
+    registrar("csUnicode", "utf-16le");
+    registrar("unicodeFEFF", "utf-16le");
+    registrar("unicodeFFFE", "utf-16be");
 }
 
 void TextCodecICU::registerCodecs(TextCodecRegistrar registrar)
 {
     // See comment above in registerEncodingNames.
     registrar("ISO-8859-8-I", create, 0);
 
     int32_t numEncodings = ucnv_countAvailable();
     for (int32_t i = 0; i < numEncodings; ++i) {
         const char* name = ucnv_getAvailableName(i);
@@ skipping 304 matching lines @@
 
 CString TextCodecICU::encodeInternal(const TextCodecInput& input, UnencodableHandling handling)
 {
     const UChar* source = input.begin();
     const UChar* end = input.end();
 
     UErrorCode err = U_ZERO_ERROR;
 
     switch (handling) {
     case QuestionMarksForUnencodables:
-        ucnv_setSubstChars(m_converterICU, "?", 1, &err);
+        if (!m_encoding.isNonByteBasedEncoding())
+            ucnv_setSubstChars(m_converterICU, "?", 1, &err);
 #if !defined(USING_SYSTEM_ICU)
         ucnv_setFromUCallBack(m_converterICU, UCNV_FROM_U_CALLBACK_SUBSTITUTE, 0, 0, 0, &err);
 #else
         ucnv_setFromUCallBack(m_converterICU, m_needsGBKFallbacks ? gbkCallbackSubstitute : UCNV_FROM_U_CALLBACK_SUBSTITUTE, 0, 0, 0, &err);
 #endif
         break;
     case EntitiesForUnencodables:
 #if !defined(USING_SYSTEM_ICU)
         ucnv_setFromUCallBack(m_converterICU, numericEntityCallback, 0, 0, 0, &err);
 #else
@@ skipping 56 matching lines @@
 {
     return encodeCommon(characters, length, handling);
 }
 
 CString TextCodecICU::encode(const LChar* characters, size_t length, UnencodableHandling handling)
 {
     return encodeCommon(characters, length, handling);
 }
 
 } // namespace WTF