Rename IFWL_Timer and IFWL_TimerInfo

fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h

Index: fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 9f529fcbc82b643fd6d7a11d8904b842222646a7..b75adadf0e67a32cf7888228742a3302910c4b43 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -7,38 +7,29 @@
 #ifndef FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
 #define FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_
 
+#include <memory>
 #include <vector>
 
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
+#include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/ifwl_adaptertimermgr.h"
-#include "xfa/fwl/core/ifwl_timerinfo.h"
-
-struct CFWL_TimerInfo;
 
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
   explicit CXFA_FWLAdapterTimerMgr(CPDFSDK_FormFillEnvironment* pFormFillEnv)
       : m_pFormFillEnv(pFormFillEnv) {}
 
-  void Start(IFWL_Timer* pTimer,
+  void Start(CFWL_Timer* pTimer,
              uint32_t dwElapse,
              bool bImmediately,
-             IFWL_TimerInfo** pTimerInfo) override;
-  void Stop(IFWL_TimerInfo* pTimerInfo) override;
+             CFWL_TimerInfo** pTimerInfo) override;
+  void Stop(CFWL_TimerInfo* pTimerInfo) override;
 
  protected:
   static void TimerProc(int32_t idEvent);
 
-  static std::vector<CFWL_TimerInfo*>* s_TimerArray;
+  static std::vector<std::unique_ptr<CFWL_TimerInfo>>* s_TimerArray;
   CPDFSDK_FormFillEnvironment* const m_pFormFillEnv;
 };
 
-struct CFWL_TimerInfo : public IFWL_TimerInfo {
-  CFWL_TimerInfo(IFWL_AdapterTimerMgr* mgr, int32_t event, IFWL_Timer* timer)
-      : IFWL_TimerInfo(mgr), idEvent(event), pTimer(timer) {}
-
-  int32_t idEvent;
-  IFWL_Timer* pTimer;
-};
-
 #endif  // FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_