Move core/fxcrt/include to core/fxcrt

core/fxcrt/fx_string.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_STRING_H_
-#define CORE_FXCRT_INCLUDE_FX_STRING_H_
+#ifndef CORE_FXCRT_FX_STRING_H_
+#define CORE_FXCRT_FX_STRING_H_
 
 #include <stdint.h>  // For intptr_t.
 
 #include <algorithm>
 #include <functional>
 
+#include "core/fxcrt/cfx_retain_ptr.h"
 #include "core/fxcrt/cfx_string_c_template.h"
 #include "core/fxcrt/cfx_string_data_template.h"
-#include "core/fxcrt/include/cfx_retain_ptr.h"
-#include "core/fxcrt/include/fx_memory.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_system.h"
 
 class CFX_ByteString;
 class CFX_WideString;
 
 using CFX_ByteStringC = CFX_StringCTemplate<FX_CHAR>;
 using CFX_WideStringC = CFX_StringCTemplate<FX_WCHAR>;
 
 #define FXBSTR_ID(c1, c2, c3, c4)                                      \
   (((uint32_t)c1 << 24) | ((uint32_t)c2 << 16) | ((uint32_t)c3 << 8) | \
    ((uint32_t)c4))
@@ skipping 274 matching lines @@
   FX_WCHAR operator[](FX_STRSIZE nIndex) const {
     return m_pData ? m_pData->m_String[nIndex] : 0;
   }
 
   void SetAt(FX_STRSIZE nIndex, FX_WCHAR ch);
 
   int Compare(const FX_WCHAR* str) const;
   int Compare(const CFX_WideString& str) const;
   int CompareNoCase(const FX_WCHAR* str) const;
 
-
   CFX_WideString Mid(FX_STRSIZE first) const;
   CFX_WideString Mid(FX_STRSIZE first, FX_STRSIZE count) const;
   CFX_WideString Left(FX_STRSIZE count) const;
   CFX_WideString Right(FX_STRSIZE count) const;
 
   FX_STRSIZE Insert(FX_STRSIZE index, FX_WCHAR ch);
   FX_STRSIZE Delete(FX_STRSIZE index, FX_STRSIZE count = 1);
 
   void Format(const FX_WCHAR* lpszFormat, ...);
   void FormatV(const FX_WCHAR* lpszFormat, va_list argList);
@@ skipping 130 matching lines @@
   std::size_t operator()(const CFX_WideString& str) const {
     return FX_HashCode_GetW(str.AsStringC(), false);
   }
 };
 
 }  // namespace std
 
 extern template struct std::hash<CFX_ByteString>;
 extern template struct std::hash<CFX_WideString>;
 
-#endif  // CORE_FXCRT_INCLUDE_FX_STRING_H_
+#endif  // CORE_FXCRT_FX_STRING_H_