Merge to master: Take Jun's UTF16LE patches.

core/src/fxcrt/fx_basic_wstring_unittest.cpp

Index: core/src/fxcrt/fx_basic_wstring_unittest.cpp
diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp
index 74410ddda31eaa1dee81702fb024da7d32b2a8c6..22f42d7985c274478d9068c20324dbc825316d6e 100644
--- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp
+++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp
@@ -283,12 +283,12 @@ TEST(fxcrt, WideStringUTF16LE_Encode) {
     CFX_WideString ws;
     CFX_ByteString bs;
   } utf16le_encode_cases[] = {
-      {L"", ByteStringLiteral("\0\0")},
-      {L"abc", ByteStringLiteral("a\0b\0c\0\0\0")},
-      {L"abcdef", ByteStringLiteral("a\0b\0c\0d\0e\0f\0\0\0")},
-      {L"abc\0def", ByteStringLiteral("a\0b\0c\0\0\0")},
-      {L"\xaabb\xccdd", ByteStringLiteral("\xbb\xaa\xdd\xcc\0\0")},
-      {L"\x3132\x6162", ByteStringLiteral("\x32\x31\x62\x61\0\0")},
+      {L"", ByteStringLiteral("")},
+      {L"abc", ByteStringLiteral("a\0b\0c\0")},
+      {L"abcdef", ByteStringLiteral("a\0b\0c\0d\0e\0f\0")},
+      {L"abc\0def", ByteStringLiteral("a\0b\0c\0")},
+      {L"\xaabb\xccdd", ByteStringLiteral("\xbb\xaa\xdd\xcc")},
+      {L"\x3132\x6162", ByteStringLiteral("\x32\x31\x62\x61")},
   };
 
   for (size_t i = 0; i < FX_ArraySize(utf16le_encode_cases); ++i) {