Move core/fxcodec/codec/include and core/fxcodec/include files up

BUILD.gn

Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 4e38d58b6e3cc5d9436e0b9209c21a0c6244e3a9..8574de51a545393643173a1f15c749761ef67f53 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -569,6 +569,7 @@ static_library("fpdftext") {
 
 static_library("fxcodec") {
   sources = [
+    "core/fxcodec/JBig2_DocumentContext.h",
     "core/fxcodec/codec/ccodec_basicmodule.h",
     "core/fxcodec/codec/ccodec_faxmodule.h",
     "core/fxcodec/codec/ccodec_flatemodule.h",
@@ -585,9 +586,8 @@ static_library("fxcodec") {
     "core/fxcodec/codec/fx_codec_jbig.cpp",
     "core/fxcodec/codec/fx_codec_jpeg.cpp",
     "core/fxcodec/codec/fx_codec_jpx_opj.cpp",
-    "core/fxcodec/include/JBig2_DocumentContext.h",
-    "core/fxcodec/include/fx_codec.h",
-    "core/fxcodec/include/fx_codec_def.h",
+    "core/fxcodec/fx_codec.h",
+    "core/fxcodec/fx_codec_def.h",
     "core/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
     "core/fxcodec/jbig2/JBig2_ArithDecoder.h",
     "core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
@@ -645,13 +645,13 @@ static_library("fxcodec") {
       "core/fxcodec/codec/ccodec_bmpmodule.h",
       "core/fxcodec/codec/ccodec_gifmodule.h",
       "core/fxcodec/codec/ccodec_pngmodule.h",
+      "core/fxcodec/codec/ccodec_progressivedecoder.h",
       "core/fxcodec/codec/ccodec_tiffmodule.h",
       "core/fxcodec/codec/fx_codec_bmp.cpp",
       "core/fxcodec/codec/fx_codec_gif.cpp",
       "core/fxcodec/codec/fx_codec_png.cpp",
       "core/fxcodec/codec/fx_codec_progress.cpp",
       "core/fxcodec/codec/fx_codec_tiff.cpp",
-      "core/fxcodec/codec/include/ccodec_progressivedecoder.h",
       "core/fxcodec/lbmp/fx_bmp.cpp",
       "core/fxcodec/lbmp/fx_bmp.h",
       "core/fxcodec/lgif/fx_gif.cpp",