Merge to XFA: Kill CFX_Object.

xfa/src/fxfa/src/app/xfa_fontmgr.h

Index: xfa/src/fxfa/src/app/xfa_fontmgr.h
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.h b/xfa/src/fxfa/src/app/xfa_fontmgr.h
index b5781c49543bf04545fc3d74408a76cb18882c75..09e0d19096b0da8a2c217ea025475a85552efa5b 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.h
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.h
@@ -13,7 +13,7 @@ struct XFA_FONTINFO {
     FX_WORD		dwStyles;
     FX_WORD		wCodePage;
 };
-class CXFA_DefFontMgr : public IXFA_FontMgr, public CFX_Object
+class CXFA_DefFontMgr : public IXFA_FontMgr
 {
 public:
     CXFA_DefFontMgr() {}
@@ -27,7 +27,7 @@ public:
 protected:
     CFX_PtrArray			m_CacheFonts;
 };
-class CXFA_PDFFontMgr : public IFX_FontProvider, public CFX_Object
+class CXFA_PDFFontMgr : public IFX_FontProvider
 {
 public:
     CXFA_PDFFontMgr(CXFA_FFDoc* pDoc);
@@ -42,7 +42,7 @@ protected:
     CXFA_FFDoc*								m_pDoc;
     CFX_CMapByteStringToPtr					m_FontArray;
 };
-class CXFA_FontMgr : public CFX_Object
+class CXFA_FontMgr
 {
 public:
     CXFA_FontMgr();