1 files changed, 5 insertions, 3 deletions
diff --git a/fpdfsdk/cpdfsdk_environment.cpp b/fpdfsdk/cpdfsdk_environment.cpp
index b17b782367..0f621eb887 100644
--- a/fpdfsdk/cpdfsdk_environment.cpp
+++ b/fpdfsdk/cpdfsdk_environment.cpp
@@ -6,6 +6,8 @@
 
 #include "fpdfsdk/include/cpdfsdk_environment.h"
 
+#include <memory>
+
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
 #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
@@ -199,19 +201,19 @@ IJS_Runtime* CPDFSDK_Environment::GetJSRuntime() {
 
 CPDFSDK_AnnotHandlerMgr* CPDFSDK_Environment::GetAnnotHandlerMgr() {
   if (!m_pAnnotHandlerMgr)
-    m_pAnnotHandlerMgr.reset(new CPDFSDK_AnnotHandlerMgr(this));
+    m_pAnnotHandlerMgr = WrapUnique(new CPDFSDK_AnnotHandlerMgr(this));
   return m_pAnnotHandlerMgr.get();
 }
 
 CPDFSDK_ActionHandler* CPDFSDK_Environment::GetActionHander() {
   if (!m_pActionHandler)
-    m_pActionHandler.reset(new CPDFSDK_ActionHandler());
+    m_pActionHandler = WrapUnique(new CPDFSDK_ActionHandler());
   return m_pActionHandler.get();
 }
 
 CFFL_InteractiveFormFiller* CPDFSDK_Environment::GetInteractiveFormFiller() {
   if (!m_pFormFiller)
-    m_pFormFiller.reset(new CFFL_InteractiveFormFiller(this));
+    m_pFormFiller = WrapUnique(new CFFL_InteractiveFormFiller(this));
   return m_pFormFiller.get();
 }