Remove fgas.h and IWYU.

R=thestig@chromium.org

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

18 files changed, 53 insertions, 40 deletions

diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
deleted file mode 100644
index 903d7d47c5..0000000000
--- a/xfa/src/fgas/include/fgas.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-// TODO(thestig): Remove this file and do IWYU.
-
-#ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_
-#define XFA_SRC_FGAS_INCLUDE_FGAS_H_
-
-#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/include/fx_datetime.h"
-#include "xfa/src/fgas/include/fx_fnt.h"
-#include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/include/fx_lgg.h"
-#include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fgas/include/fx_mem.h"
-#include "xfa/src/fgas/include/fx_rbk.h"
-#include "xfa/src/fgas/include/fx_sax.h"
-#include "xfa/src/fgas/include/fx_stm.h"
-#include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fgas/include/fx_tbk.h"
-#include "xfa/src/fgas/include/fx_ucd.h"
-#include "xfa/src/fgas/include/fx_utl.h"
-
-#endif  // XFA_SRC_FGAS_INCLUDE_FGAS_H_
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 5637913a97..cf35491f9b 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -8,11 +8,9 @@
 #define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
 
 #include "core/include/fxcrt/fx_xml.h"
+#include "xfa/src/fgas/include/fx_datetime.h"
 
 class CFX_Unitime;
-class IFX_Locale;
-class IFX_FormatString;
-class IFX_LocaleMgr;
 
 enum FX_LOCALENUMSYMBOL {
   FX_LOCALENUMSYMBOL_Decimal,
diff --git a/xfa/src/fgas/include/fx_sax.h b/xfa/src/fgas/include/fx_sax.h
index 02468d31d2..e4b72f6328 100644
--- a/xfa/src/fgas/include/fx_sax.h
+++ b/xfa/src/fgas/include/fx_sax.h
@@ -7,8 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
 
-class IFX_SAXReaderHandler;
-class IFX_SAXReader;
+#include "core/include/fxcrt/fx_basic.h"
+
 #define FX_SAXPARSEMODE_NotConvert_amp 0x0001
 #define FX_SAXPARSEMODE_NotConvert_lt 0x0002
 #define FX_SAXPARSEMODE_NotConvert_gt 0x0004
@@ -16,6 +16,7 @@ class IFX_SAXReader;
 #define FX_SAXPARSEMODE_NotConvert_quot 0x0010
 #define FX_SAXPARSEMODE_NotConvert_sharp 0x0020
 #define FX_SAXPARSEMODE_NotSkipSpace 0x0100
+
 enum FX_SAXNODE {
   FX_SAXNODE_Unknown = 0,
   FX_SAXNODE_Instruction,
@@ -25,6 +26,7 @@ enum FX_SAXNODE {
   FX_SAXNODE_Text,
   FX_SAXNODE_CharData,
 };
+
 class IFX_SAXReaderHandler {
  public:
   virtual ~IFX_SAXReaderHandler() {}
@@ -48,6 +50,7 @@ class IFX_SAXReaderHandler {
                             const CFX_ByteStringC& bsData,
                             FX_DWORD dwStartPos) = 0;
 };
+
 class IFX_SAXReader {
  public:
   virtual ~IFX_SAXReader() {}
diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h
index 5b5382ec14..d4fec2a74d 100644
--- a/xfa/src/fgas/include/fx_sys.h
+++ b/xfa/src/fgas/include/fx_sys.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
 
+#include "core/include/fxcrt/fx_system.h"
+
 #define FX_RAD2DEG(r) ((r)*180.0f / FX_PI)
 #define FX_DEG2RAD(a) ((a)*FX_PI / 180.0f)
 
diff --git a/xfa/src/fgas/src/crt/fx_codepage.cpp b/xfa/src/fgas/src/crt/fx_codepage.cpp
index 16c363bd14..7cf82121d3 100644
--- a/xfa/src/fgas/src/crt/fx_codepage.cpp
+++ b/xfa/src/fgas/src/crt/fx_codepage.cpp
@@ -4,7 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/include/fx_lgg.h"
 #include "xfa/src/fgas/src/fgas_base.h"
+
 static const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
     {0, 1252},   {1, 0},      {2, 42},     {77, 10000}, {78, 10001},
     {79, 10003}, {80, 10008}, {81, 10002}, {83, 10005}, {84, 10004},
diff --git a/xfa/src/fgas/src/crt/fx_encode.cpp b/xfa/src/fgas/src/crt/fx_encode.cpp
index 5c5d547eab..8d225047ec 100644
--- a/xfa/src/fgas/src/crt/fx_encode.cpp
+++ b/xfa/src/fgas/src/crt/fx_encode.cpp
@@ -4,7 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/src/fgas_base.h"
+
 void FX_SwapByteOrder(FX_WCHAR* pStr, int32_t iLength) {
   FXSYS_assert(pStr != NULL);
   if (iLength < 0) {
diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp
index d6630045e4..cca0cb275d 100644
--- a/xfa/src/fgas/src/crt/fx_stream.cpp
+++ b/xfa/src/fgas/src/crt/fx_stream.cpp
@@ -4,10 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/crt/fx_stream.h"
+
 #include <algorithm>
 
-#include "xfa/src/fgas/src/crt/fx_stream.h"
+#include "xfa/src/fgas/include/fx_cpg.h"
+#include "xfa/src/fgas/include/fx_sys.h"
 #include "xfa/src/fgas/src/fgas_base.h"
+
 IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead,
                                      FX_DWORD dwAccess,
                                      int32_t iFileSize,
diff --git a/xfa/src/fgas/src/fgas_base.h b/xfa/src/fgas/src/fgas_base.h
index 055f059a49..28356acca3 100644
--- a/xfa/src/fgas/src/fgas_base.h
+++ b/xfa/src/fgas/src/fgas_base.h
@@ -10,7 +10,6 @@
 #define XFA_SRC_FGAS_SRC_FGAS_BASE_H_
 
 #include "core/include/fxge/fx_freetype.h"
-#include "xfa/src/fgas/include/fgas.h"
 #include "xfa/src/foxitlib.h"
 
 #endif  // XFA_SRC_FGAS_SRC_FGAS_BASE_H_
diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp
index 2943a99915..e71d83e12e 100644
--- a/xfa/src/fgas/src/font/fx_gefont.cpp
+++ b/xfa/src/fgas/src/font/fx_gefont.cpp
@@ -4,9 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/font/fx_gefont.h"
+
+#include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/font/fx_fontutils.h"
-#include "xfa/src/fgas/src/font/fx_gefont.h"
 
 IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily,
                              FX_DWORD dwFontStyles,
diff --git a/xfa/src/fgas/src/font/fx_gefont.h b/xfa/src/fgas/src/font/fx_gefont.h
index bea01c04ea..8fb207d588 100644
--- a/xfa/src/fgas/src/font/fx_gefont.h
+++ b/xfa/src/fgas/src/font/fx_gefont.h
@@ -7,10 +7,11 @@
 #ifndef XFA_SRC_FGAS_SRC_FONT_FX_GEFONT_H_
 #define XFA_SRC_FGAS_SRC_FONT_FX_GEFONT_H_
 
-class CFX_GEFontMgr;
-#ifndef FXFONT_SUBST_ITALIC
+#include "xfa/src/fgas/include/fx_fnt.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
 #define FXFONT_SUBST_ITALIC 0x02
-#endif
+
 class CFX_GEFont : public IFX_Font {
  public:
   CFX_GEFont(const CFX_GEFont& src, FX_DWORD dwFontStyles);
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
index d881e8da87..e187a2e07d 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.cpp
@@ -4,10 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/src/font/fx_stdfontmgr.h"
+
 #include "core/include/fxcrt/fx_stream.h"
+#include "xfa/src/fgas/include/fx_cpg.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/font/fx_fontutils.h"
-#include "xfa/src/fgas/src/font/fx_stdfontmgr.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 IFX_FontMgr* IFX_FontMgr::Create(FX_LPEnumAllFonts pEnumerator,
diff --git a/xfa/src/fgas/src/font/fx_stdfontmgr.h b/xfa/src/fgas/src/font/fx_stdfontmgr.h
index 42aea16a3a..55359de829 100644
--- a/xfa/src/fgas/src/font/fx_stdfontmgr.h
+++ b/xfa/src/fgas/src/font/fx_stdfontmgr.h
@@ -7,11 +7,14 @@
 #ifndef XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
 #define XFA_SRC_FGAS_SRC_FONT_FX_STDFONTMGR_H_
 
+#include "xfa/src/fgas/include/fx_fnt.h"
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 int32_t FX_GetSimilarValue(FX_LPCFONTDESCRIPTOR pFont, FX_DWORD dwFontStyles);
 FX_LPCFONTDESCRIPTOR FX_DefFontMatcher(FX_LPFONTMATCHPARAMS pParams,
                                        const CFX_FontDescriptors& fonts,
                                        void* pUserData);
+
 class CFX_StdFontMgrImp : public IFX_FontMgr {
  public:
   CFX_StdFontMgrImp(FX_LPEnumAllFonts pEnumerator,
@@ -70,7 +73,9 @@ class CFX_StdFontMgrImp : public IFX_FontMgr {
   IFX_Font* GetFont(FX_LPCFONTDESCRIPTOR pFD, FX_DWORD dwFontStyles);
 };
 FX_DWORD FX_GetGdiFontStyles(const LOGFONTW& lf);
+
 #else
+
 class CFX_FontDescriptor {
  public:
   CFX_FontDescriptor()
@@ -92,6 +97,7 @@ class CFX_FontDescriptor {
   FX_DWORD m_dwCsb[2];
 };
 typedef CFX_ArrayTemplate<CFX_FontDescriptor*> CFX_FontDescriptors;
+
 struct FX_FontDescriptorInfo {
  public:
   CFX_FontDescriptor* pFont;
@@ -107,6 +113,7 @@ struct FX_FontDescriptorInfo {
   };
 };
 typedef CFX_ArrayTemplate<FX_FontDescriptorInfo> CFX_FontDescriptorInfos;
+
 struct FX_HandleParentPath {
   FX_HandleParentPath() {}
   FX_HandleParentPath(const FX_HandleParentPath& x) {
@@ -116,6 +123,7 @@ struct FX_HandleParentPath {
   void* pFileHandle;
   CFX_ByteString bsParentPath;
 };
+
 class CFX_FontSourceEnum_File : public IFX_FontSourceEnum {
  public:
   CFX_FontSourceEnum_File();
@@ -139,6 +147,7 @@ typedef CFX_MapPtrTemplate<FX_WCHAR, IFX_Font*> CFX_UnicodeFontMap;
 typedef CFX_MapPtrTemplate<IFX_FileAccess*, CFX_ArrayTemplate<IFX_Font*>*>
     CFX_FileFontMap;
 typedef CFX_MapPtrTemplate<IFX_Font*, IFX_FileRead*> CFX_FonStreamtMap;
+
 class CFX_FontMgrImp : public IFX_FontMgr {
  public:
   CFX_FontMgrImp(IFX_FontSourceEnum* pFontEnum,
diff --git a/xfa/src/fgas/src/layout/fx_linebreak.cpp b/xfa/src/fgas/src/layout/fx_linebreak.cpp
index e89dfb7486..7bceaf361e 100644
--- a/xfa/src/fgas/src/layout/fx_linebreak.cpp
+++ b/xfa/src/fgas/src/layout/fx_linebreak.cpp
@@ -4,6 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/include/fx_lbk.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 
 const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32] = {
diff --git a/xfa/src/fgas/src/layout/fx_rtfbreak.h b/xfa/src/fgas/src/layout/fx_rtfbreak.h
index 39e53ed96c..a54b83bf3d 100644
--- a/xfa/src/fgas/src/layout/fx_rtfbreak.h
+++ b/xfa/src/fgas/src/layout/fx_rtfbreak.h
@@ -8,6 +8,7 @@
 #define XFA_SRC_FGAS_SRC_LAYOUT_FX_RTFBREAK_H_
 
 #include "core/include/fxcrt/fx_arb.h"
+#include "xfa/src/fgas/include/fx_rbk.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 
 class CFX_RTFLine;
diff --git a/xfa/src/fgas/src/localization/fx_datetime.cpp b/xfa/src/fgas/src/localization/fx_datetime.cpp
index 99d383b30f..7ea82af802 100644
--- a/xfa/src/fgas/src/localization/fx_datetime.cpp
+++ b/xfa/src/fgas/src/localization/fx_datetime.cpp
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "xfa/src/fgas/include/fx_datetime.h"
+
 #include "xfa/src/fgas/src/fgas_base.h"
 
 #if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
diff --git a/xfa/src/fgas/src/localization/fx_localeimp.h b/xfa/src/fgas/src/localization/fx_localeimp.h
index 02e4c5254f..2d4783d726 100644
--- a/xfa/src/fgas/src/localization/fx_localeimp.h
+++ b/xfa/src/fgas/src/localization/fx_localeimp.h
@@ -7,7 +7,10 @@
 #ifndef XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEIMP_H_
 #define XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEIMP_H_
 
+#include "xfa/src/fgas/include/fx_locale.h"
+
 class CFX_LCNumeric;
+
 class CFX_Locale : public IFX_Locale {
  public:
   CFX_Locale(CXML_Element* pLocaleData);
@@ -40,6 +43,7 @@ class CFX_Locale : public IFX_Locale {
   virtual ~CFX_Locale();
   CXML_Element* m_pElement;
 };
+
 class CFX_FormatString : public IFX_FormatString {
  public:
   CFX_FormatString(IFX_LocaleMgr* pLocaleMgr, FX_BOOL bUseLCID);
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.h b/xfa/src/fgas/src/localization/fx_localemgr.h
index 96f072a7e2..3405b9ecab 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.h
+++ b/xfa/src/fgas/src/localization/fx_localemgr.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEMGR_H_
 #define XFA_SRC_FGAS_SRC_LOCALIZATION_FX_LOCALEMGR_H_
 
+#include "xfa/src/fgas/include/fx_locale.h"
+
 class CFX_LocaleMgr : public IFX_LocaleMgr {
  public:
   CFX_LocaleMgr(FX_WORD wDefLCID);
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h
index 8418c4e0c1..13e5036ec3 100644
--- a/xfa/src/fgas/src/xml/fx_sax_imp.h
+++ b/xfa/src/fgas/src/xml/fx_sax_imp.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_SRC_XML_FX_SAX_IMP_H_
 #define XFA_SRC_FGAS_SRC_XML_FX_SAX_IMP_H_
 
+#include "xfa/src/fgas/include/fx_sax.h"
+
 class CFX_SAXFile {
  public:
   CFX_SAXFile();
@@ -21,6 +23,7 @@ class CFX_SAXFile {
   FX_DWORD m_dwBufSize;
   FX_DWORD m_dwBufIndex;
 };
+
 enum FX_SAXMODE {
   FX_SAXMODE_Text = 0,
   FX_SAXMODE_NodeStart,
@@ -38,6 +41,7 @@ enum FX_SAXMODE {
   FX_SAXMODE_TargetData,
   FX_SAXMODE_MAX,
 };
+
 class CFX_SAXItem {
  public:
   CFX_SAXItem()
@@ -54,12 +58,14 @@ class CFX_SAXItem {
   CFX_SAXItem* m_pPrev;
   CFX_SAXItem* m_pNext;
 };
+
 class CFX_SAXCommentContext {
  public:
   CFX_SAXCommentContext() : m_iHeaderCount(0), m_iTailCount(0) {}
   int32_t m_iHeaderCount;
   int32_t m_iTailCount;
 };
+
 class CFX_SAXReader : public IFX_SAXReader {
  public:
   CFX_SAXReader();