Move core/include/fxcrt to core/fxcrt/include.

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 40165ae374b4e39be042a13c7f257b7ea93dc350..753e5a72be5b6abf64ec4a410e9678c6b78d1aa8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -575,6 +575,7 @@ static_library("fxcrt") {
     "core/fxcrt/fx_basic_util.cpp",
     "core/fxcrt/fx_basic_wstring.cpp",
     "core/fxcrt/fx_bidi.cpp",
+    "core/fxcrt/fx_bidi.h",
     "core/fxcrt/fx_extension.cpp",
     "core/fxcrt/fx_ucddata.cpp",
     "core/fxcrt/fx_unicode.cpp",
@@ -587,26 +588,25 @@ static_library("fxcrt") {
     "core/fxcrt/fxcrt_stream.cpp",
     "core/fxcrt/fxcrt_windows.cpp",
     "core/fxcrt/fxcrt_windows.h",
+    "core/fxcrt/include/fx_basic.h",
+    "core/fxcrt/include/fx_coordinates.h",
+    "core/fxcrt/include/fx_ext.h",
+    "core/fxcrt/include/fx_memory.h",
+    "core/fxcrt/include/fx_safe_types.h",
+    "core/fxcrt/include/fx_stream.h",
+    "core/fxcrt/include/fx_string.h",
+    "core/fxcrt/include/fx_system.h",
+    "core/fxcrt/include/fx_ucd.h",
+    "core/fxcrt/include/fx_xml.h",
     "core/fxcrt/plex.h",
     "core/fxcrt/xml_int.h",
-    "core/include/fxcrt/fx_basic.h",
-    "core/include/fxcrt/fx_bidi.h",
-    "core/include/fxcrt/fx_coordinates.h",
-    "core/include/fxcrt/fx_ext.h",
-    "core/include/fxcrt/fx_memory.h",
-    "core/include/fxcrt/fx_safe_types.h",
-    "core/include/fxcrt/fx_stream.h",
-    "core/include/fxcrt/fx_string.h",
-    "core/include/fxcrt/fx_system.h",
-    "core/include/fxcrt/fx_ucd.h",
-    "core/include/fxcrt/fx_xml.h",
   ]
   if (pdf_enable_xfa) {
     sources += [
       "core/fxcrt/fx_arabic.cpp",
       "core/fxcrt/fx_arabic.h",
       "core/fxcrt/fx_basic_maps.cpp",
-      "core/include/fxcrt/fx_arb.h",
+      "core/fxcrt/include/fx_arb.h",
     ]
   }
   configs += [ ":pdfium_config" ]
@@ -1055,6 +1055,28 @@ if (pdf_enable_xfa) {
       "xfa/fxbarcode/BC_Utils.cpp",
       "xfa/fxbarcode/BC_Writer.cpp",
       "xfa/fxbarcode/BC_Writer.h",
+      "xfa/fxbarcode/cbc_codabar.cpp",
+      "xfa/fxbarcode/cbc_codabar.h",
+      "xfa/fxbarcode/cbc_code128.cpp",
+      "xfa/fxbarcode/cbc_code128.h",
+      "xfa/fxbarcode/cbc_code39.cpp",
+      "xfa/fxbarcode/cbc_code39.h",
+      "xfa/fxbarcode/cbc_codebase.cpp",
+      "xfa/fxbarcode/cbc_codebase.h",
+      "xfa/fxbarcode/cbc_datamatrix.cpp",
+      "xfa/fxbarcode/cbc_datamatrix.h",
+      "xfa/fxbarcode/cbc_ean13.cpp",
+      "xfa/fxbarcode/cbc_ean13.h",
+      "xfa/fxbarcode/cbc_ean8.cpp",
+      "xfa/fxbarcode/cbc_ean8.h",
+      "xfa/fxbarcode/cbc_onecode.cpp",
+      "xfa/fxbarcode/cbc_onecode.h",
+      "xfa/fxbarcode/cbc_pdf417i.cpp",
+      "xfa/fxbarcode/cbc_pdf417i.h",
+      "xfa/fxbarcode/cbc_qrcode.cpp",
+      "xfa/fxbarcode/cbc_qrcode.h",
+      "xfa/fxbarcode/cbc_upca.cpp",
+      "xfa/fxbarcode/cbc_upca.h",
       "xfa/fxbarcode/common/BC_CommonBitArray.cpp",
       "xfa/fxbarcode/common/BC_CommonBitArray.h",
       "xfa/fxbarcode/common/BC_CommonBitMatrix.cpp",
@@ -1129,6 +1151,7 @@ if (pdf_enable_xfa) {
       "xfa/fxbarcode/datamatrix/BC_TextEncoder.h",
       "xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp",
       "xfa/fxbarcode/datamatrix/BC_X12Encoder.h",
+      "xfa/fxbarcode/include/BC_Library.h",
       "xfa/fxbarcode/oned/BC_OneDReader.cpp",
       "xfa/fxbarcode/oned/BC_OneDReader.h",
       "xfa/fxbarcode/oned/BC_OneDimReader.cpp",
@@ -1472,29 +1495,6 @@ if (pdf_enable_xfa) {
       "xfa/include/fwl/theme/scrollbartp.h",
       "xfa/include/fwl/theme/utils.h",
       "xfa/include/fwl/theme/widgettp.h",
-      "xfa/fxbarcode/include/BC_Library.h",
-      "xfa/fxbarcode/cbc_codebase.h",
-      "xfa/fxbarcode/cbc_codebase.cpp",
-      "xfa/fxbarcode/cbc_onecode.h",
-      "xfa/fxbarcode/cbc_onecode.cpp",
-      "xfa/fxbarcode/cbc_code39.h",
-      "xfa/fxbarcode/cbc_code39.cpp",
-      "xfa/fxbarcode/cbc_codabar.h",
-      "xfa/fxbarcode/cbc_ean13.h",
-      "xfa/fxbarcode/cbc_ean13.cpp",
-      "xfa/fxbarcode/cbc_upca.h",
-      "xfa/fxbarcode/cbc_upca.cpp",
-      "xfa/fxbarcode/cbc_qrcode.h",
-      "xfa/fxbarcode/cbc_qrcode.cpp",
-      "xfa/fxbarcode/cbc_pdf417i.h",
-      "xfa/fxbarcode/cbc_pdf417i.cpp",
-      "xfa/fxbarcode/cbc_datamatrix.h",
-      "xfa/fxbarcode/cbc_datamatrix.cpp",
-      "xfa/fxbarcode/cbc_codabar.cpp",
-      "xfa/fxbarcode/cbc_code128.h",
-      "xfa/fxbarcode/cbc_code128.cpp",
-      "xfa/fxbarcode/cbc_ean8.h",
-      "xfa/fxbarcode/cbc_ean8.cpp",
       "xfa/include/fxfa/fxfa.h",
       "xfa/include/fxfa/fxfa_basic.h",
       "xfa/include/fxfa/fxfa_objectacc.h",