Cleanup CFX_CharMap

This CL removes the CFX_CharMap class and moves the two static methods
into the files in which they're used.

Change-Id: I8ff7cbfd7f1ef3970e39c77ffa3439099f7fec02
Reviewed-on: https://pdfium-review.googlesource.com/4873
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 3 insertions, 20 deletions

diff --git a/core/fxcrt/fx_basic.h b/core/fxcrt/fx_basic.h
index ed2f579579..8669c66f5e 100644
--- a/core/fxcrt/fx_basic.h
+++ b/core/fxcrt/fx_basic.h
@@ -131,36 +131,19 @@ class CFX_FileBufferArchive {
   CFX_RetainPtr<IFX_WriteStream> m_pFile;
 };
 
-class CFX_CharMap {
- public:
-  static CFX_ByteString GetByteString(uint16_t codepage,
-                                      const CFX_WideStringC& wstr);
-
-  static CFX_WideString GetWideString(uint16_t codepage,
-                                      const CFX_ByteStringC& bstr);
-
-  CFX_CharMap() = delete;
-};
-
 class CFX_UTF8Decoder {
  public:
   CFX_UTF8Decoder() { m_PendingBytes = 0; }
 
   void Clear();
-
   void Input(uint8_t byte);
-
   void AppendChar(uint32_t ch);
-
   void ClearStatus() { m_PendingBytes = 0; }
-
   CFX_WideStringC GetResult() const { return m_Buffer.AsStringC(); }
 
- protected:
+ private:
   int m_PendingBytes;
-
   uint32_t m_PendingChar;
-
   CFX_WideTextBuf m_Buffer;
 };
 
@@ -172,7 +155,7 @@ class CFX_UTF8Encoder {
   void AppendStr(const CFX_ByteStringC& str) { m_Buffer << str; }
   CFX_ByteStringC GetResult() const { return m_Buffer.AsStringC(); }
 
- protected:
+ private:
   CFX_ByteTextBuf m_Buffer;
 };
 
@@ -207,7 +190,7 @@ class CFX_BitStream {
     return m_BitSize >= m_BitPos ? m_BitSize - m_BitPos : 0;
   }
 
- protected:
+ private:
   uint32_t m_BitPos;
   uint32_t m_BitSize;
   const uint8_t* m_pData;