From c0a3a9b72f9bddd0b0a2b0465d961c6d9584558b Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Tue, 2 Oct 2018 22:38:26 +0000
Subject: Remove unneeded cfgas_fontmgr.h includes.

Fix IWYU issues in affected files.

Change-Id: I92c145348549d2d0f0e066e134e649b3b958e068
Reviewed-on: https://pdfium-review.googlesource.com/c/43313
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 testing/test_support.h           |  2 +-
 xfa/fgas/font/cfgas_gefont.h     |  5 +++--
 xfa/fwl/cfx_barcode_unittest.cpp |  1 +
 xfa/fxfa/cxfa_fontmgr.h          | 10 +++-------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/testing/test_support.h b/testing/test_support.h
index 56b2f113b3..4dcab15e63 100644
--- a/testing/test_support.h
+++ b/testing/test_support.h
@@ -14,7 +14,7 @@
 #include "public/fpdfview.h"
 
 #ifdef PDF_ENABLE_XFA
-#include "xfa/fgas/font/cfgas_fontmgr.h"
+class CFGAS_FontMgr;
 #endif  // PDF_ENABLE_XFA
 
 namespace pdfium {
diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
index 4c5d31c02d..fac6de9849 100644
--- a/xfa/fgas/font/cfgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -12,13 +12,14 @@
 #include <utility>
 #include <vector>
 
-#include "core/fxcrt/fx_memory.h"
+#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/maybe_owned.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "third_party/base/optional.h"
 #include "xfa/fgas/font/cfgas_fontmgr.h"
-#include "xfa/fgas/font/cfgas_pdffontmgr.h"
 
+class CFX_Font;
 class CFX_UnicodeEncodingEx;
 
 class CFGAS_GEFont final : public Retainable {
diff --git a/xfa/fwl/cfx_barcode_unittest.cpp b/xfa/fwl/cfx_barcode_unittest.cpp
index 953bb1cd1f..9d8caf21f3 100644
--- a/xfa/fwl/cfx_barcode_unittest.cpp
+++ b/xfa/fwl/cfx_barcode_unittest.cpp
@@ -12,6 +12,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "core/fxge/cfx_defaultrenderdevice.h"
 #include "core/fxge/cfx_renderdevice.h"
+#include "core/fxge/dib/cfx_dibitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 #include "testing/utils/bitmap_saver.h"
diff --git a/xfa/fxfa/cxfa_fontmgr.h b/xfa/fxfa/cxfa_fontmgr.h
index e7bc0d958f..c009598e06 100644
--- a/xfa/fxfa/cxfa_fontmgr.h
+++ b/xfa/fxfa/cxfa_fontmgr.h
@@ -9,15 +9,11 @@
 
 #include <map>
 
-#include "core/fxcrt/fx_extension.h"
-#include "core/fxcrt/fx_system.h"
-#include "core/fxcrt/retain_ptr.h"
+#include "core/fxcrt/fx_string.h"
 #include "xfa/fgas/font/cfgas_defaultfontmanager.h"
-#include "xfa/fgas/font/cfgas_fontmgr.h"
-#include "xfa/fgas/font/cfgas_pdffontmgr.h"
-#include "xfa/fxfa/fxfa.h"
 
-class CPDF_Font;
+class CFGAS_GEFont;
+class CXFA_FFDoc;
 
 class CXFA_FontMgr {
  public:
-- 
cgit v1.2.3