2 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/javascript/cjs_context.cpp b/fpdfsdk/javascript/cjs_context.cpp
index 406339d7af..06abf7f48d 100644
--- a/fpdfsdk/javascript/cjs_context.cpp
+++ b/fpdfsdk/javascript/cjs_context.cpp
@@ -11,13 +11,11 @@
 #include "fpdfsdk/javascript/resource.h"
 
 CJS_Context::CJS_Context(CJS_Runtime* pRuntime)
-    : m_pRuntime(pRuntime), m_bBusy(FALSE) {
-  m_pEventHandler = new CJS_EventHandler(this);
-}
+    : m_pRuntime(pRuntime),
+      m_pEventHandler(new CJS_EventHandler(this)),
+      m_bBusy(FALSE) {}
 
-CJS_Context::~CJS_Context() {
-  delete m_pEventHandler;
-}
+CJS_Context::~CJS_Context() {}
 
 CPDFSDK_Document* CJS_Context::GetReaderDocument() {
   return m_pRuntime->GetReaderDocument();
diff --git a/fpdfsdk/javascript/cjs_context.h b/fpdfsdk/javascript/cjs_context.h
index cccdbc7669..49ba42c6d1 100644
--- a/fpdfsdk/javascript/cjs_context.h
+++ b/fpdfsdk/javascript/cjs_context.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_JAVASCRIPT_CJS_CONTEXT_H_
 #define FPDFSDK_JAVASCRIPT_CJS_CONTEXT_H_
 
+#include <memory>
+
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "fpdfsdk/javascript/ijs_context.h"
@@ -121,14 +123,14 @@ class CJS_Context : public IJS_Context {
   void OnExternal_Exec() override;
 
   CJS_Runtime* GetJSRuntime() const { return m_pRuntime; }
-  CJS_EventHandler* GetEventHandler() const { return m_pEventHandler; }
+  CJS_EventHandler* GetEventHandler() const { return m_pEventHandler.get(); }
 
   CPDFDoc_Environment* GetReaderApp();
   CPDFSDK_Document* GetReaderDocument();
 
  private:
-  CJS_Runtime* m_pRuntime;
-  CJS_EventHandler* m_pEventHandler;
+  CJS_Runtime* const m_pRuntime;
+  std::unique_ptr<CJS_EventHandler> m_pEventHandler;
   FX_BOOL m_bBusy;
 };