Rename both As{Byte,Wide}StringC() helpers to AsStringC().

core/fpdfdoc/doc_formcontrol.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 <algorithm>
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_form.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
@@ skipping 60 matching lines @@
 
     auto subdict_it = pSubDict->begin();
     while (subdict_it != pSubDict->end()) {
       const CFX_ByteString& csKey2 = subdict_it->first;
       CPDF_Object* pObj2 = subdict_it->second;
       ++subdict_it;
       if (!pObj2) {
         continue;
       }
       if (csKey2 != "Off") {
-        pSubDict->ReplaceKey(csKey2.AsByteStringC(), csValue.AsByteStringC());
+        pSubDict->ReplaceKey(csKey2.AsStringC(), csValue.AsStringC());
         break;
       }
     }
   }
 }
 CFX_ByteString CPDF_FormControl::GetCheckedAPState() {
   ASSERT(GetType() == CPDF_FormField::CheckBox ||
          GetType() == CPDF_FormField::RadioButton);
   CFX_ByteString csOn = GetOnStateName();
   if (GetType() == CPDF_FormField::RadioButton ||
@@ skipping 103 matching lines @@
   }
   return Invert;
 }
 
 CPDF_ApSettings CPDF_FormControl::GetMK() const {
   return CPDF_ApSettings(m_pWidgetDict ? m_pWidgetDict->GetDictBy("MK")
                                        : nullptr);
 }
 
 bool CPDF_FormControl::HasMKEntry(CFX_ByteString csEntry) const {
-  return GetMK().HasMKEntry(csEntry.AsByteStringC());
+  return GetMK().HasMKEntry(csEntry.AsStringC());
 }
 
 int CPDF_FormControl::GetRotation() {
   return GetMK().GetRotation();
 }
 
 FX_ARGB CPDF_FormControl::GetColor(int& iColorType, CFX_ByteString csEntry) {
-  return GetMK().GetColor(iColorType, csEntry.AsByteStringC());
+  return GetMK().GetColor(iColorType, csEntry.AsStringC());
 }
 
 FX_FLOAT CPDF_FormControl::GetOriginalColor(int index, CFX_ByteString csEntry) {
-  return GetMK().GetOriginalColor(index, csEntry.AsByteStringC());
+  return GetMK().GetOriginalColor(index, csEntry.AsStringC());
 }
 
 void CPDF_FormControl::GetOriginalColor(int& iColorType,
                                         FX_FLOAT fc[4],
                                         CFX_ByteString csEntry) {
-  GetMK().GetOriginalColor(iColorType, fc, csEntry.AsByteStringC());
+  GetMK().GetOriginalColor(iColorType, fc, csEntry.AsStringC());
 }
 CFX_WideString CPDF_FormControl::GetCaption(CFX_ByteString csEntry) {
-  return GetMK().GetCaption(csEntry.AsByteStringC());
+  return GetMK().GetCaption(csEntry.AsStringC());
 }
 
 CPDF_Stream* CPDF_FormControl::GetIcon(CFX_ByteString csEntry) {
-  return GetMK().GetIcon(csEntry.AsByteStringC());
+  return GetMK().GetIcon(csEntry.AsStringC());
 }
 
 CPDF_IconFit CPDF_FormControl::GetIconFit() {
   return GetMK().GetIconFit();
 }
 
 int CPDF_FormControl::GetTextPosition() {
   return GetMK().GetTextPosition();
 }
 
@@ skipping 38 matching lines @@
   CFX_ByteString csFontNameTag;
   FX_FLOAT fFontSize;
   cDA.GetFont(csFontNameTag, fFontSize);
   if (csFontNameTag.IsEmpty())
     return nullptr;
 
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pWidgetDict, "DR");
   if (CPDF_Dictionary* pDict = ToDictionary(pObj)) {
     CPDF_Dictionary* pFonts = pDict->GetDictBy("Font");
     if (pFonts) {
-      CPDF_Dictionary* pElement =
-          pFonts->GetDictBy(csFontNameTag.AsByteStringC());
+      CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC());
       if (pElement) {
         CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
         if (pFont) {
           return pFont;
         }
       }
     }
   }
   if (CPDF_Font* pFormFont = m_pField->m_pForm->GetFormFont(csFontNameTag))
     return pFormFont;
 
   CPDF_Dictionary* pPageDict = m_pWidgetDict->GetDictBy("P");
   pObj = FPDF_GetFieldAttr(pPageDict, "Resources");
   if (CPDF_Dictionary* pDict = ToDictionary(pObj)) {
     CPDF_Dictionary* pFonts = pDict->GetDictBy("Font");
     if (pFonts) {
-      CPDF_Dictionary* pElement =
-          pFonts->GetDictBy(csFontNameTag.AsByteStringC());
+      CPDF_Dictionary* pElement = pFonts->GetDictBy(csFontNameTag.AsStringC());
       if (pElement) {
         CPDF_Font* pFont = m_pField->m_pForm->m_pDocument->LoadFont(pElement);
         if (pFont) {
           return pFont;
         }
       }
     }
   }
   return nullptr;
 }
@@ skipping 109 matching lines @@
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
   return CPDF_IconFit(m_pDict ? m_pDict->GetDictBy("IF") : nullptr);
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetIntegerBy("TP", TEXTPOS_CAPTION)
                  : TEXTPOS_CAPTION;
 }