Remove CPDF_CMapParser friends

This CL removes the friends from CPDF_CMapParser. The two needed methods
have been moved from private statics to public methods on the class.

Change-Id: Ida76aa8748435e089874d9ef9c6545527b175561
Reviewed-on: https://pdfium-review.googlesource.com/15454
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 5 insertions, 7 deletions

diff --git a/core/fpdfapi/font/cpdf_cmapparser.h b/core/fpdfapi/font/cpdf_cmapparser.h
index 874f6a776d..fc46c58f72 100644
--- a/core/fpdfapi/font/cpdf_cmapparser.h
+++ b/core/fpdfapi/font/cpdf_cmapparser.h
@@ -28,16 +28,14 @@ class CPDF_CMapParser {
     return std::move(m_AdditionalCharcodeToCIDMappings);
   }
 
+  uint32_t GetCode(const ByteStringView& word) const;
+  bool GetCodeRange(CPDF_CMap::CodeRange& range,
+                    const ByteStringView& first,
+                    const ByteStringView& second) const;
+
   static CIDSet CharsetFromOrdering(const ByteStringView& ordering);
 
  private:
-  friend class cpdf_cmapparser_CMap_GetCode_Test;
-  friend class cpdf_cmapparser_CMap_GetCodeRange_Test;
-
-  static uint32_t CMap_GetCode(const ByteStringView& word);
-  static bool CMap_GetCodeRange(CPDF_CMap::CodeRange& range,
-                                const ByteStringView& first,
-                                const ByteStringView& second);
 
   UnownedPtr<CPDF_CMap> const m_pCMap;
   int m_Status;