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, 22 insertions, 20 deletions

diff --git a/core/fpdfapi/font/cpdf_cmapparser_unittest.cpp b/core/fpdfapi/font/cpdf_cmapparser_unittest.cpp
index 8d99b0dbff..1a36eb79ac 100644
--- a/core/fpdfapi/font/cpdf_cmapparser_unittest.cpp
+++ b/core/fpdfapi/font/cpdf_cmapparser_unittest.cpp
@@ -18,37 +18,39 @@ bool uint_ranges_equal(uint8_t* a, uint8_t* b, size_t count) {
 
 }  // namespace
 
-TEST(cpdf_cmapparser, CMap_GetCode) {
-  EXPECT_EQ(0u, CPDF_CMapParser::CMap_GetCode(""));
-  EXPECT_EQ(0u, CPDF_CMapParser::CMap_GetCode("<"));
-  EXPECT_EQ(194u, CPDF_CMapParser::CMap_GetCode("<c2"));
-  EXPECT_EQ(162u, CPDF_CMapParser::CMap_GetCode("<A2"));
-  EXPECT_EQ(2802u, CPDF_CMapParser::CMap_GetCode("<Af2"));
-  EXPECT_EQ(162u, CPDF_CMapParser::CMap_GetCode("<A2z"));
+TEST(cpdf_cmapparser, GetCode) {
+  CPDF_CMapParser parser(nullptr);
 
-  EXPECT_EQ(12u, CPDF_CMapParser::CMap_GetCode("12"));
-  EXPECT_EQ(12u, CPDF_CMapParser::CMap_GetCode("12d"));
-  EXPECT_EQ(128u, CPDF_CMapParser::CMap_GetCode("128"));
+  EXPECT_EQ(0u, parser.GetCode(""));
+  EXPECT_EQ(0u, parser.GetCode("<"));
+  EXPECT_EQ(194u, parser.GetCode("<c2"));
+  EXPECT_EQ(162u, parser.GetCode("<A2"));
+  EXPECT_EQ(2802u, parser.GetCode("<Af2"));
+  EXPECT_EQ(162u, parser.GetCode("<A2z"));
 
-  EXPECT_EQ(4294967295u, CPDF_CMapParser::CMap_GetCode("<FFFFFFFF"));
+  EXPECT_EQ(12u, parser.GetCode("12"));
+  EXPECT_EQ(12u, parser.GetCode("12d"));
+  EXPECT_EQ(128u, parser.GetCode("128"));
+
+  EXPECT_EQ(4294967295u, parser.GetCode("<FFFFFFFF"));
 
   // Overflow a uint32_t.
-  EXPECT_EQ(0u, CPDF_CMapParser::CMap_GetCode("<100000000"));
+  EXPECT_EQ(0u, parser.GetCode("<100000000"));
 }
 
-TEST(cpdf_cmapparser, CMap_GetCodeRange) {
+TEST(cpdf_cmapparser, GetCodeRange) {
+  CPDF_CMapParser parser(nullptr);
   CPDF_CMap::CodeRange range;
 
   // Must start with a <
-  EXPECT_FALSE(CPDF_CMapParser::CMap_GetCodeRange(range, "", ""));
-  EXPECT_FALSE(CPDF_CMapParser::CMap_GetCodeRange(range, "A", ""));
+  EXPECT_FALSE(parser.GetCodeRange(range, "", ""));
+  EXPECT_FALSE(parser.GetCodeRange(range, "A", ""));
 
   // m_CharSize must be <= 4
-  EXPECT_FALSE(CPDF_CMapParser::CMap_GetCodeRange(range, "<aaaaaaaaaa>", ""));
+  EXPECT_FALSE(parser.GetCodeRange(range, "<aaaaaaaaaa>", ""));
   EXPECT_EQ(5u, range.m_CharSize);
 
-  EXPECT_TRUE(
-      CPDF_CMapParser::CMap_GetCodeRange(range, "<12345678>", "<87654321>"));
+  EXPECT_TRUE(parser.GetCodeRange(range, "<12345678>", "<87654321>"));
   EXPECT_EQ(4u, range.m_CharSize);
   {
     uint8_t lower[4] = {18, 52, 86, 120};
@@ -58,13 +60,13 @@ TEST(cpdf_cmapparser, CMap_GetCodeRange) {
   }
 
   // Hex characters
-  EXPECT_TRUE(CPDF_CMapParser::CMap_GetCodeRange(range, "<a1>", "<F3>"));
+  EXPECT_TRUE(parser.GetCodeRange(range, "<a1>", "<F3>"));
   EXPECT_EQ(1u, range.m_CharSize);
   EXPECT_EQ(161, range.m_Lower[0]);
   EXPECT_EQ(243, range.m_Upper[0]);
 
   // The second string should return 0's if it is shorter
-  EXPECT_TRUE(CPDF_CMapParser::CMap_GetCodeRange(range, "<a1>", ""));
+  EXPECT_TRUE(parser.GetCodeRange(range, "<a1>", ""));
   EXPECT_EQ(1u, range.m_CharSize);
   EXPECT_EQ(161, range.m_Lower[0]);
   EXPECT_EQ(0, range.m_Upper[0]);