Remove CFX_{Byte,Wide}String::ConvertFrom().

core/src/fxcrt/fx_basic_bstring.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <stddef.h>  // For offsetof().
 #include <cctype>
 
 #include "core/include/fxcrt/fx_basic.h"
@@ skipping 892 matching lines @@
   CopyBeforeWrite();
   m_pData->m_String[nIndex] = ch;
 }
 CFX_WideString CFX_ByteString::UTF8Decode() const {
   CFX_UTF8Decoder decoder;
   for (FX_STRSIZE i = 0; i < GetLength(); i++) {
     decoder.Input((uint8_t)m_pData->m_String[i]);
   }
   return decoder.GetResult();
 }
+
+// static
 CFX_ByteString CFX_ByteString::FromUnicode(const FX_WCHAR* str,
                                            FX_STRSIZE len) {
-  if (len < 0) {
-    len = FXSYS_wcslen(str);
-  }
-  CFX_ByteString bstr;
-  bstr.ConvertFrom(CFX_WideString(str, len));
-  return bstr;
+  FX_STRSIZE str_len = len >= 0 ? len : FXSYS_wcslen(str);
+  return FromUnicode(CFX_WideString(str, str_len));
 }
+
+// static
 CFX_ByteString CFX_ByteString::FromUnicode(const CFX_WideString& str) {
-  return FromUnicode(str.c_str(), str.GetLength());
+  CFX_CharMap* pCharMap = CFX_CharMap::GetDefaultMapper();
+  return (*pCharMap->m_GetByteString)(pCharMap, str);
 }
-void CFX_ByteString::ConvertFrom(const CFX_WideString& str,
-                                 CFX_CharMap* pCharMap) {
-  if (!pCharMap) {
-    pCharMap = CFX_CharMap::GetDefaultMapper();
-  }
-  *this = (*pCharMap->m_GetByteString)(pCharMap, str);
-}
+
 int CFX_ByteString::Compare(const CFX_ByteStringC& str) const {
   if (!m_pData) {
     return str.IsEmpty() ? 0 : -1;
   }
   int this_len = m_pData->m_nDataLength;
   int that_len = str.GetLength();
   int min_len = this_len < that_len ? this_len : that_len;
   for (int i = 0; i < min_len; i++) {
     if ((uint8_t)m_pData->m_String[i] < str.GetAt(i)) {
       return -1;
@@ skipping 145 matching lines @@
     fraction %= scale;
     scale /= 10;
   }
   return buf_size;
 }
 CFX_ByteString CFX_ByteString::FormatFloat(FX_FLOAT d, int precision) {
   FX_CHAR buf[32];
   FX_STRSIZE len = FX_ftoa(d, buf);
   return CFX_ByteString(buf, len);
 }