Move core/fpdftext/include to core/fpdftext

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2383563002

11 files changed, 23 insertions, 23 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 8e552f31d6..4e38d58b6e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -553,11 +553,11 @@ static_library("fpdfapi") {
 static_library("fpdftext") {
   sources = [
     "core/fpdftext/cpdf_linkextract.cpp",
+    "core/fpdftext/cpdf_linkextract.h",
     "core/fpdftext/cpdf_textpage.cpp",
+    "core/fpdftext/cpdf_textpage.h",
     "core/fpdftext/cpdf_textpagefind.cpp",
-    "core/fpdftext/include/cpdf_linkextract.h",
-    "core/fpdftext/include/cpdf_textpage.h",
-    "core/fpdftext/include/cpdf_textpagefind.h",
+    "core/fpdftext/cpdf_textpagefind.h",
     "core/fpdftext/unicodenormalizationdata.cpp",
     "core/fpdftext/unicodenormalizationdata.h",
   ]
diff --git a/core/fpdftext/cpdf_linkextract.cpp b/core/fpdftext/cpdf_linkextract.cpp
index 1677b67b55..021cc5e009 100644
--- a/core/fpdftext/cpdf_linkextract.cpp
+++ b/core/fpdftext/cpdf_linkextract.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdftext/include/cpdf_linkextract.h"
+#include "core/fpdftext/cpdf_linkextract.h"
 
 #include <vector>
 
-#include "core/fpdftext/include/cpdf_textpage.h"
+#include "core/fpdftext/cpdf_textpage.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
diff --git a/core/fpdftext/include/cpdf_linkextract.h b/core/fpdftext/cpdf_linkextract.h
index 5d471e0f1c..159b330f94 100644
--- a/core/fpdftext/include/cpdf_linkextract.h
+++ b/core/fpdftext/cpdf_linkextract.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFTEXT_INCLUDE_CPDF_LINKEXTRACT_H_
-#define CORE_FPDFTEXT_INCLUDE_CPDF_LINKEXTRACT_H_
+#ifndef CORE_FPDFTEXT_CPDF_LINKEXTRACT_H_
+#define CORE_FPDFTEXT_CPDF_LINKEXTRACT_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ class CPDF_LinkExtract {
   std::vector<Link> m_LinkArray;
 };
 
-#endif  // CORE_FPDFTEXT_INCLUDE_CPDF_LINKEXTRACT_H_
+#endif  // CORE_FPDFTEXT_CPDF_LINKEXTRACT_H_
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 44d5a198b0..4fdbc3129d 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdftext/include/cpdf_textpage.h"
+#include "core/fpdftext/cpdf_textpage.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/core/fpdftext/include/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index 64b1613e7e..46fcafa6c0 100644
--- a/core/fpdftext/include/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_
-#define CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_
+#ifndef CORE_FPDFTEXT_CPDF_TEXTPAGE_H_
+#define CORE_FPDFTEXT_CPDF_TEXTPAGE_H_
 
 #include <deque>
 #include <vector>
@@ -178,4 +178,4 @@ class CPDF_TextPage {
   CFX_FloatRect m_CurlineRect;
 };
 
-#endif  // CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGE_H_
+#endif  // CORE_FPDFTEXT_CPDF_TEXTPAGE_H_
diff --git a/core/fpdftext/cpdf_textpagefind.cpp b/core/fpdftext/cpdf_textpagefind.cpp
index a67bdf15d5..03dd21b475 100644
--- a/core/fpdftext/cpdf_textpagefind.cpp
+++ b/core/fpdftext/cpdf_textpagefind.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdftext/include/cpdf_textpagefind.h"
+#include "core/fpdftext/cpdf_textpagefind.h"
 
 #include <cwchar>
 #include <cwctype>
 #include <vector>
 
-#include "core/fpdftext/include/cpdf_textpage.h"
+#include "core/fpdftext/cpdf_textpage.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "third_party/base/stl_util.h"
diff --git a/core/fpdftext/include/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h
index 4950bd1113..2cc4c1e48c 100644
--- a/core/fpdftext/include/cpdf_textpagefind.h
+++ b/core/fpdftext/cpdf_textpagefind.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGEFIND_H_
-#define CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGEFIND_H_
+#ifndef CORE_FPDFTEXT_CPDF_TEXTPAGEFIND_H_
+#define CORE_FPDFTEXT_CPDF_TEXTPAGEFIND_H_
 
 #include <vector>
 
@@ -57,4 +57,4 @@ class CPDF_TextPageFind {
   FX_BOOL m_IsFind;
 };
 
-#endif  // CORE_FPDFTEXT_INCLUDE_CPDF_TEXTPAGEFIND_H_
+#endif  // CORE_FPDFTEXT_CPDF_TEXTPAGEFIND_H_
diff --git a/core/fpdftext/fpdf_text_int_unittest.cpp b/core/fpdftext/fpdf_text_int_unittest.cpp
index 0ee11d2d57..d7e48768bc 100644
--- a/core/fpdftext/fpdf_text_int_unittest.cpp
+++ b/core/fpdftext/fpdf_text_int_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fpdftext/include/cpdf_linkextract.h"
+#include "core/fpdftext/cpdf_linkextract.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 30e2079961..8fc863dda3 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  '+core/fpdftext/include',
+  '+core/fpdftext',
   '+core/fpdfapi',
   '+core/fpdfapi/fpdf_edit',
   '+core/fpdfapi/fpdf_page',
diff --git a/fpdfsdk/fpdf_searchex.cpp b/fpdfsdk/fpdf_searchex.cpp
index 9c987f2691..f82db37b5a 100644
--- a/fpdfsdk/fpdf_searchex.cpp
+++ b/fpdfsdk/fpdf_searchex.cpp
@@ -6,7 +6,7 @@
 
 #include "public/fpdf_searchex.h"
 
-#include "core/fpdftext/include/cpdf_textpage.h"
+#include "core/fpdftext/cpdf_textpage.h"
 
 DLLEXPORT int STDCALL
 FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex) {
diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp
index 4a637b7662..4a84c3589d 100644
--- a/fpdfsdk/fpdftext.cpp
+++ b/fpdfsdk/fpdftext.cpp
@@ -8,9 +8,9 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_viewerpreferences.h"
-#include "core/fpdftext/include/cpdf_linkextract.h"
-#include "core/fpdftext/include/cpdf_textpage.h"
-#include "core/fpdftext/include/cpdf_textpagefind.h"
+#include "core/fpdftext/cpdf_linkextract.h"
+#include "core/fpdftext/cpdf_textpage.h"
+#include "core/fpdftext/cpdf_textpagefind.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "third_party/base/numerics/safe_conversions.h"
 #include "third_party/base/stl_util.h"