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

core/fxcrt/fx_xml_parser.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 "core/fxcrt/xml_int.h"
 
 #include <vector>
 
@@ skipping 353 matching lines @@
     return nullptr;
   }
   CFX_ByteString tag_name, tag_space;
   FX_BOOL bEndTag;
   GetTagName(tag_space, tag_name, bEndTag, bStartTag);
   if (tag_name.IsEmpty() || bEndTag) {
     return nullptr;
   }
   CXML_Element* pElement = new CXML_Element;
   pElement->m_pParent = pParent;
-  pElement->SetTag(tag_space.AsByteStringC(), tag_name.AsByteStringC());
+  pElement->SetTag(tag_space.AsStringC(), tag_name.AsStringC());
   do {
     CFX_ByteString attr_space, attr_name;
     while (m_dwIndex < m_dwBufferSize) {
       SkipWhiteSpaces();
       if (IsEOF()) {
         break;
       }
       if (!g_FXCRT_XML_IsNameIntro(m_pBuffer[m_dwIndex])) {
         break;
       }
       GetName(attr_space, attr_name);
       SkipWhiteSpaces();
       if (IsEOF()) {
         break;
       }
       if (m_pBuffer[m_dwIndex] != '=') {
         break;
       }
       m_dwIndex++;
       SkipWhiteSpaces();
       if (IsEOF()) {
         break;
       }
       CFX_WideString attr_value;
       GetAttrValue(attr_value);
-      pElement->m_AttrMap.SetAt(attr_space.AsByteStringC(),
-                                attr_name.AsByteStringC(),
-                                attr_value.AsWideStringC());
+      pElement->m_AttrMap.SetAt(attr_space.AsStringC(), attr_name.AsStringC(),
+                                attr_value.AsStringC());
     }
     m_nOffset = m_nBufferOffset + (FX_FILESIZE)m_dwIndex;
     if (m_dwIndex < m_dwBufferSize || IsEOF()) {
       break;
     }
   } while (ReadNextBlock());
   SkipWhiteSpaces();
   if (IsEOF()) {
     return pElement;
   }
@@ skipping 42 matching lines @@
             GetName(space, name);
             SkipWhiteSpaces();
             m_dwIndex++;
             iState = 10;
           } else {
             content << decoder.GetResult();
             CFX_WideString dataStr = content.GetWideString();
             if (!bCDATA && !m_bSaveSpaceChars) {
               dataStr.TrimRight(L" \t\r\n");
             }
-            InsertContentSegment(bCDATA, dataStr.AsWideStringC(), pElement);
+            InsertContentSegment(bCDATA, dataStr.AsStringC(), pElement);
             content.Clear();
             decoder.Clear();
             bCDATA = FALSE;
             iState = 0;
             m_dwIndex--;
             CXML_Element* pSubElement = ParseElement(pElement, TRUE);
             if (!pSubElement) {
               break;
             }
             pSubElement->m_pParent = pElement;
@@ skipping 23 matching lines @@
     m_nOffset = m_nBufferOffset + (FX_FILESIZE)m_dwIndex;
     if (iState == 10 || m_dwIndex < m_dwBufferSize || IsEOF()) {
       break;
     }
   } while (ReadNextBlock());
   content << decoder.GetResult();
   CFX_WideString dataStr = content.GetWideString();
   if (!m_bSaveSpaceChars) {
     dataStr.TrimRight(L" \t\r\n");
   }
-  InsertContentSegment(bCDATA, dataStr.AsWideStringC(), pElement);
+  InsertContentSegment(bCDATA, dataStr.AsStringC(), pElement);
   content.Clear();
   decoder.Clear();
   bCDATA = FALSE;
   return pElement;
 }
 void CXML_Parser::InsertContentSegment(FX_BOOL bCDATA,
                                        const CFX_WideStringC& content,
                                        CXML_Element* pElement) {
   if (content.IsEmpty()) {
     return;
@@ skipping 75 matching lines @@
   }
   CFX_ByteString bsTag = m_QSpaceName;
   bsTag += ":";
   bsTag += m_TagName;
   return bsTag;
 }
 CFX_ByteString CXML_Element::GetNamespace(FX_BOOL bQualified) const {
   if (bQualified) {
     return m_QSpaceName;
   }
-  return GetNamespaceURI(m_QSpaceName.AsByteStringC());
+  return GetNamespaceURI(m_QSpaceName.AsStringC());
 }
 CFX_ByteString CXML_Element::GetNamespaceURI(
     const CFX_ByteStringC& qName) const {
   const CFX_WideString* pwsSpace;
   const CXML_Element* pElement = this;
   do {
     if (qName.IsEmpty()) {
       pwsSpace = pElement->m_AttrMap.Lookup("", "xmlns");
     } else {
       pwsSpace = pElement->m_AttrMap.Lookup("xmlns", qName);
@@ skipping 172 matching lines @@
   m_pMap->push_back({space, name, value});
 }
 
 int CXML_AttrMap::GetSize() const {
   return m_pMap ? pdfium::CollectionSize<int>(*m_pMap) : 0;
 }
 
 CXML_AttrItem& CXML_AttrMap::GetAt(int index) const {
   return (*m_pMap)[index];
 }