Move core/fxcrt/include to core/fxcrt

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 8574de51a545393643173a1f15c749761ef67f53..0c3bd09f42029c4a60ce855ead02d18908caf5e5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -680,9 +680,15 @@ config("fxge_warnings") {
 
 static_library("fxcrt") {
   sources = [
+    "core/fxcrt/cfx_count_ref.h",
+    "core/fxcrt/cfx_observable.h",
+    "core/fxcrt/cfx_retain_ptr.h",
     "core/fxcrt/cfx_string_c_template.h",
     "core/fxcrt/cfx_string_data_template.h",
+    "core/fxcrt/cfx_string_pool_template.h",
+    "core/fxcrt/cfx_weak_ptr.h",
     "core/fxcrt/extension.h",
+    "core/fxcrt/fx_basic.h",
     "core/fxcrt/fx_basic_array.cpp",
     "core/fxcrt/fx_basic_bstring.cpp",
     "core/fxcrt/fx_basic_buffer.cpp",
@@ -696,9 +702,18 @@ static_library("fxcrt") {
     "core/fxcrt/fx_basic_wstring.cpp",
     "core/fxcrt/fx_bidi.cpp",
     "core/fxcrt/fx_bidi.h",
+    "core/fxcrt/fx_coordinates.h",
+    "core/fxcrt/fx_ext.h",
     "core/fxcrt/fx_extension.cpp",
+    "core/fxcrt/fx_memory.h",
+    "core/fxcrt/fx_safe_types.h",
+    "core/fxcrt/fx_stream.h",
+    "core/fxcrt/fx_string.h",
+    "core/fxcrt/fx_system.h",
+    "core/fxcrt/fx_ucd.h",
     "core/fxcrt/fx_ucddata.cpp",
     "core/fxcrt/fx_unicode.cpp",
+    "core/fxcrt/fx_xml.h",
     "core/fxcrt/fx_xml_composer.cpp",
     "core/fxcrt/fx_xml_parser.cpp",
     "core/fxcrt/fxcrt_posix.cpp",
@@ -706,21 +721,6 @@ static_library("fxcrt") {
     "core/fxcrt/fxcrt_stream.cpp",
     "core/fxcrt/fxcrt_windows.cpp",
     "core/fxcrt/fxcrt_windows.h",
-    "core/fxcrt/include/cfx_count_ref.h",
-    "core/fxcrt/include/cfx_observable.h",
-    "core/fxcrt/include/cfx_retain_ptr.h",
-    "core/fxcrt/include/cfx_string_pool_template.h",
-    "core/fxcrt/include/cfx_weak_ptr.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",
   ]
@@ -736,9 +736,9 @@ static_library("fxcrt") {
   if (pdf_enable_xfa) {
     sources += [
       "core/fxcrt/fx_arabic.cpp",
+      "core/fxcrt/fx_arabic.h",
+      "core/fxcrt/fx_arb.h",
       "core/fxcrt/fx_basic_maps.cpp",
-      "core/fxcrt/include/fx_arabic.h",
-      "core/fxcrt/include/fx_arb.h",
     ]
   }
 }