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

This CL moves the fxcrt code into the core/fxcrt directory. The only exception
was fx_bidi.h which was moved into core/fxcrt as it is not used outside of
core/.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1825953002 .

8 files changed, 13 insertions, 13 deletions

diff --git a/core/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp
index b6843bae9a..2e267fd05d 100644
--- a/core/fpdftext/fpdf_text_int.cpp
+++ b/core/fpdftext/fpdf_text_int.cpp
@@ -22,10 +22,10 @@
 #include "core/fpdftext/include/ipdf_textpage.h"
 #include "core/fpdftext/include/ipdf_textpagefind.h"
 #include "core/fpdftext/unicodenormalization.h"
+#include "core/fxcrt/fx_bidi.h"
+#include "core/fxcrt/include/fx_ext.h"
+#include "core/fxcrt/include/fx_ucd.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
-#include "core/include/fxcrt/fx_bidi.h"
-#include "core/include/fxcrt/fx_ext.h"
-#include "core/include/fxcrt/fx_ucd.h"
 #include "third_party/base/stl_util.h"
 
 #define FPDFTEXT_RLTB 1
diff --git a/core/fpdftext/fpdf_text_int.h b/core/fpdftext/fpdf_text_int.h
index be6b0bf241..a4274d7aed 100644
--- a/core/fpdftext/fpdf_text_int.h
+++ b/core/fpdftext/fpdf_text_int.h
@@ -16,7 +16,7 @@
 #include "core/fpdftext/include/ipdf_linkextract.h"
 #include "core/fpdftext/include/ipdf_textpage.h"
 #include "core/fpdftext/include/ipdf_textpagefind.h"
-#include "core/include/fxcrt/fx_basic.h"
+#include "core/fxcrt/include/fx_basic.h"
 
 class CFX_BidiChar;
 class CPDF_FormObject;
diff --git a/core/fpdftext/include/ipdf_linkextract.h b/core/fpdftext/include/ipdf_linkextract.h
index 2d7fe02127..c1a5f2f04e 100644
--- a/core/fpdftext/include/ipdf_linkextract.h
+++ b/core/fpdftext/include/ipdf_linkextract.h
@@ -7,9 +7,9 @@
 #ifndef CORE_FPDFTEXT_INCLUDE_IPDF_LINKEXTRACT_H_
 #define CORE_FPDFTEXT_INCLUDE_IPDF_LINKEXTRACT_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
 #include "core/fpdftext/include/ipdf_textpage.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
 
 class IPDF_LinkExtract {
  public:
diff --git a/core/fpdftext/include/ipdf_textpage.h b/core/fpdftext/include/ipdf_textpage.h
index ad3bea8062..3849cd4004 100644
--- a/core/fpdftext/include/ipdf_textpage.h
+++ b/core/fpdftext/include/ipdf_textpage.h
@@ -7,8 +7,8 @@
 #ifndef CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGE_H_
 #define CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGE_H_
 
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
 
 class CPDF_TextObject;
 class CPDF_Page;
diff --git a/core/fpdftext/include/ipdf_textpagefind.h b/core/fpdftext/include/ipdf_textpagefind.h
index 88774b6061..b13432b59b 100644
--- a/core/fpdftext/include/ipdf_textpagefind.h
+++ b/core/fpdftext/include/ipdf_textpagefind.h
@@ -8,8 +8,8 @@
 #define CORE_FPDFTEXT_INCLUDE_IPDF_TEXTPAGEFIND_H_
 
 #include "core/fpdftext/include/ipdf_textpage.h"
-#include "core/include/fxcrt/fx_coordinates.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_string.h"
 
 class IPDF_TextPageFind {
  public:
diff --git a/core/fpdftext/unicodenormalization.cpp b/core/fpdftext/unicodenormalization.cpp
index dd563e5ee3..67ab57cb5d 100644
--- a/core/fpdftext/unicodenormalization.cpp
+++ b/core/fpdftext/unicodenormalization.cpp
@@ -7,7 +7,7 @@
 #include "core/fpdftext/unicodenormalization.h"
 
 #include "core/fpdftext/unicodenormalizationdata.h"
-#include "core/include/fxcrt/fx_string.h"
+#include "core/fxcrt/include/fx_string.h"
 
 namespace {
 
diff --git a/core/fpdftext/unicodenormalization.h b/core/fpdftext/unicodenormalization.h
index d9beafbd41..ee3c8b2024 100644
--- a/core/fpdftext/unicodenormalization.h
+++ b/core/fpdftext/unicodenormalization.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FPDFTEXT_UNICODENORMALIZATION_H_
 #define CORE_FPDFTEXT_UNICODENORMALIZATION_H_
 
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
 
 FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst);
 
diff --git a/core/fpdftext/unicodenormalizationdata.cpp b/core/fpdftext/unicodenormalizationdata.cpp
index b22625cf9e..e124bf4540 100644
--- a/core/fpdftext/unicodenormalizationdata.cpp
+++ b/core/fpdftext/unicodenormalizationdata.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdftext/unicodenormalizationdata.h"
-#include "core/include/fxcrt/fx_system.h"
+#include "core/fxcrt/include/fx_system.h"
 
 const uint16_t g_UnicodeData_Normalization[65536] = {
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,