Merge to XFA: Kill CFX_Object.

fpdfsdk/include/fpdfxfa/fpdfxfa_util.h

 // 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
 
 #ifndef _FPDFXFA_UTIL_H_
 #define _FPDFXFA_UTIL_H_
 
 #define JS_STR_VIEWERTYPE_STANDARD              L"Exchange"
 #define JS_STR_LANGUANGE                                L"ENU"
 #define JS_STR_VIEWERVARIATION                  L"Full"
 #define JS_STR_VIEWERVERSION_XFA                L"11"
 
-class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr, public CFX_Object
+class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr
 {
 public:
         CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv)
         {
 
         }
         virtual FWL_ERR         Start(IFWL_Timer *pTimer, FX_DWORD dwElapse, FWL_HTIMER &hTimer, FX_BOOL bImmediately = TRUE);
         virtual FWL_ERR         Stop(FWL_HTIMER hTimer);
 
 protected:
         static void TimerProc(FX_INT32 idEvent);
 
         static CFX_PtrArray     ms_timerArray;
         CPDFDoc_Environment* m_pEnv;
 };
 
-class CFWL_TimerInfo : public CFX_Object
+class CFWL_TimerInfo
 {
 public:
         CFWL_TimerInfo()
                 : pTimer(NULL)
         {
 
         }
         FX_UINT32 uIDEvent;
         IFWL_Timer *pTimer;
 };
 
 #endif