Make down-conversion explicit from CFX_ByteString to CFX_ByteStringC.

core/fxcrt/include/fx_basic.h

 // 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
 
 #ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
 #define CORE_FXCRT_INCLUDE_FX_BASIC_H_
 
 #include <algorithm>
 #include <memory>
 
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_stream.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 
 class CFX_BinaryBuf {
  public:
   CFX_BinaryBuf();
   explicit CFX_BinaryBuf(FX_STRSIZE size);
   ~CFX_BinaryBuf();
 
   uint8_t* GetBuffer() const { return m_pBuffer.get(); }
   FX_STRSIZE GetSize() const { return m_DataSize; }
 
   void Clear();
   void EstimateSize(FX_STRSIZE size, FX_STRSIZE alloc_step = 0);
   void AppendBlock(const void* pBuf, FX_STRSIZE size);
-  void AppendString(const CFX_ByteStringC& str) {
-    AppendBlock(str.GetPtr(), str.GetLength());
+  void AppendString(const CFX_ByteString& str) {
+    AppendBlock(str.c_str(), str.GetLength());
   }
 
   void AppendByte(uint8_t byte) {
     ExpandBuf(1);
     m_pBuffer.get()[m_DataSize++] = byte;
   }
 
   void InsertBlock(FX_STRSIZE pos, const void* pBuf, FX_STRSIZE size);
   void Delete(int start_index, int count);
 
@@ skipping 14 matching lines @@
 
 class CFX_ByteTextBuf : public CFX_BinaryBuf {
  public:
   void AppendChar(int ch) { AppendByte((uint8_t)ch); }
   FX_STRSIZE GetLength() const { return m_DataSize; }
   CFX_ByteStringC GetByteString() const;
 
   CFX_ByteTextBuf& operator<<(int i);
   CFX_ByteTextBuf& operator<<(uint32_t i);
   CFX_ByteTextBuf& operator<<(double f);
+  CFX_ByteTextBuf& operator<<(const FX_CHAR* pStr) {
+    return *this << CFX_ByteStringC(pStr);
+  }
+  CFX_ByteTextBuf& operator<<(const CFX_ByteString& str) {
+    return *this << str.AsByteStringC();
+  }
   CFX_ByteTextBuf& operator<<(const CFX_ByteStringC& lpsz);
   CFX_ByteTextBuf& operator<<(const CFX_ByteTextBuf& buf);
 };
 
 class CFX_WideTextBuf : public CFX_BinaryBuf {
  public:
   void AppendChar(FX_WCHAR wch);
   FX_STRSIZE GetLength() const { return m_DataSize / sizeof(FX_WCHAR); }
   FX_WCHAR* GetBuffer() const {
     return reinterpret_cast<FX_WCHAR*>(m_pBuffer.get());
@@ skipping 1041 matching lines @@
   FX_FLOAT c;
   FX_FLOAT d;
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 #endif  // CORE_FXCRT_INCLUDE_FX_BASIC_H_