Move core/fxcrt/include to core/fxcrt
BUG=pdfium:611
Review-Url: https://codereview.chromium.org/2382723003
diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/include/cba_annotiterator.h
index 7d9078e..38332db 100644
--- a/fpdfsdk/include/cba_annotiterator.h
+++ b/fpdfsdk/include/cba_annotiterator.h
@@ -10,8 +10,8 @@
#include <vector>
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
class CPDFSDK_Annot;
class CPDFSDK_PageView;
diff --git a/fpdfsdk/include/cpdfsdk_annot.h b/fpdfsdk/include/cpdfsdk_annot.h
index 7356ce8..b7b7399 100644
--- a/fpdfsdk/include/cpdfsdk_annot.h
+++ b/fpdfsdk/include/cpdfsdk_annot.h
@@ -10,8 +10,8 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_annot.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/include/cfx_observable.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/cfx_observable.h"
+#include "core/fxcrt/fx_basic.h"
#include "fpdfsdk/cfx_systemhandler.h"
#include "fpdfsdk/include/fsdk_common.h"
#include "fpdfsdk/include/fsdk_define.h"
diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
index da54c7e..717f87f 100644
--- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h
+++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
@@ -11,8 +11,8 @@
#include <memory>
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
class CFX_Matrix;
diff --git a/fpdfsdk/include/cpdfsdk_baannot.h b/fpdfsdk/include/cpdfsdk_baannot.h
index 9cc1680..dea717a 100644
--- a/fpdfsdk/include/cpdfsdk_baannot.h
+++ b/fpdfsdk/include/cpdfsdk_baannot.h
@@ -11,8 +11,8 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_annot.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
#include "fpdfsdk/cfx_systemhandler.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
diff --git a/fpdfsdk/include/cpdfsdk_baannothandler.h b/fpdfsdk/include/cpdfsdk_baannothandler.h
index ae88452..44e0cbb 100644
--- a/fpdfsdk/include/cpdfsdk_baannothandler.h
+++ b/fpdfsdk/include/cpdfsdk_baannothandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_
#define FPDFSDK_INCLUDE_CPDFSDK_BAANNOTHANDLER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "fpdfsdk/include/ipdfsdk_annothandler.h"
class CFFL_InteractiveFormFiller;
diff --git a/fpdfsdk/include/cpdfsdk_document.h b/fpdfsdk/include/cpdfsdk_document.h
index c142055..fe6ac94 100644
--- a/fpdfsdk/include/cpdfsdk_document.h
+++ b/fpdfsdk/include/cpdfsdk_document.h
@@ -11,7 +11,7 @@
#include <memory>
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fxcrt/include/cfx_observable.h"
+#include "core/fxcrt/cfx_observable.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_formfill.h"
diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h
index 35b4850..1bf541e 100644
--- a/fpdfsdk/include/cpdfsdk_environment.h
+++ b/fpdfsdk/include/cpdfsdk_environment.h
@@ -12,7 +12,7 @@
#include "core/fpdfapi/fpdf_page/cpdf_page.h"
#include "core/fpdfapi/fpdf_parser/cpdf_document.h"
#include "core/fpdfdoc/cpdf_occontext.h"
-#include "core/fxcrt/include/cfx_observable.h"
+#include "core/fxcrt/cfx_observable.h"
#include "fpdfsdk/cfx_systemhandler.h"
#include "fpdfsdk/include/fsdk_define.h"
#include "public/fpdf_formfill.h"
diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h
index b186ceb..6bea3cf 100644
--- a/fpdfsdk/include/cpdfsdk_interform.h
+++ b/fpdfsdk/include/cpdfsdk_interform.h
@@ -12,7 +12,7 @@
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/ipdf_formnotify.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "core/fxcrt/fx_basic.h"
#include "core/fxge/include/fx_dib.h"
class CPDF_Dictionary;
diff --git a/fpdfsdk/include/cpdfsdk_pageview.h b/fpdfsdk/include/cpdfsdk_pageview.h
index 0bcce28..c31f6d3 100644
--- a/fpdfsdk/include/cpdfsdk_pageview.h
+++ b/fpdfsdk/include/cpdfsdk_pageview.h
@@ -11,7 +11,7 @@
#include <vector>
#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
#include "fpdfsdk/include/cpdfsdk_document.h"
diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h
index 0171091..8c10a21 100644
--- a/fpdfsdk/include/cpdfsdk_widget.h
+++ b/fpdfsdk/include/cpdfsdk_widget.h
@@ -12,8 +12,8 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_action.h"
#include "core/fpdfdoc/cpdf_annot.h"
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
#include "fpdfsdk/include/cpdfsdk_baannot.h"
#include "fpdfsdk/include/pdfsdk_fieldaction.h"
#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
diff --git a/fpdfsdk/include/cpdfsdk_widgethandler.h b/fpdfsdk/include/cpdfsdk_widgethandler.h
index b18f623..ca3da87 100644
--- a/fpdfsdk/include/cpdfsdk_widgethandler.h
+++ b/fpdfsdk/include/cpdfsdk_widgethandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_
#define FPDFSDK_INCLUDE_CPDFSDK_WIDGETHANDLER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "fpdfsdk/include/ipdfsdk_annothandler.h"
class CFFL_InteractiveFormFiller;
diff --git a/fpdfsdk/include/cpdfsdk_xfawidget.h b/fpdfsdk/include/cpdfsdk_xfawidget.h
index 311c225..99309b9 100644
--- a/fpdfsdk/include/cpdfsdk_xfawidget.h
+++ b/fpdfsdk/include/cpdfsdk_xfawidget.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_
#define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGET_H_
-#include "core/fxcrt/include/fx_coordinates.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_string.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
class CPDFSDK_InterForm;
diff --git a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h
index 2bf9779..425c57c 100644
--- a/fpdfsdk/include/cpdfsdk_xfawidgethandler.h
+++ b/fpdfsdk/include/cpdfsdk_xfawidgethandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_
#define FPDFSDK_INCLUDE_CPDFSDK_XFAWIDGETHANDLER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "fpdfsdk/include/ipdfsdk_annothandler.h"
class CFX_Matrix;
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index fc67588..ce15b83 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -12,7 +12,7 @@
#include "core/fpdfdoc/cpdf_aaction.h"
#include "core/fpdfdoc/cpdf_action.h"
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#include "fpdfsdk/include/pdfsdk_fieldaction.h"
class CPDFSDK_Annot;
diff --git a/fpdfsdk/include/fsdk_pauseadapter.h b/fpdfsdk/include/fsdk_pauseadapter.h
index 793e8f2..4a37f5c 100644
--- a/fpdfsdk/include/fsdk_pauseadapter.h
+++ b/fpdfsdk/include/fsdk_pauseadapter.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_
#define FPDFSDK_INCLUDE_FSDK_PAUSEADAPTER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_system.h"
#include "public/fpdf_progressive.h"
class IFSDK_PAUSE_Adapter : public IFX_Pause {
diff --git a/fpdfsdk/include/ipdfsdk_annothandler.h b/fpdfsdk/include/ipdfsdk_annothandler.h
index f1db698..3102cb4 100644
--- a/fpdfsdk/include/ipdfsdk_annothandler.h
+++ b/fpdfsdk/include/ipdfsdk_annothandler.h
@@ -7,8 +7,8 @@
#ifndef FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_
#define FPDFSDK_INCLUDE_IPDFSDK_ANNOTHANDLER_H_
-#include "core/fxcrt/include/fx_basic.h"
-#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/fx_basic.h"
+#include "core/fxcrt/fx_coordinates.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
class CFX_Matrix;
diff --git a/fpdfsdk/include/pdfsdk_fieldaction.h b/fpdfsdk/include/pdfsdk_fieldaction.h
index 385fbf6..4ed8b94 100644
--- a/fpdfsdk/include/pdfsdk_fieldaction.h
+++ b/fpdfsdk/include/pdfsdk_fieldaction.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_
#define FPDFSDK_INCLUDE_PDFSDK_FIELDACTION_H_
-#include "core/fxcrt/include/fx_string.h"
+#include "core/fxcrt/fx_string.h"
#ifdef PDF_ENABLE_XFA
typedef enum {