1 files changed, 10 insertions, 8 deletions
diff --git a/core/fxge/android/cfpf_skiadevicemodule.cpp b/core/fxge/android/cfpf_skiadevicemodule.cpp
index 7bdf64666f..bb3f70afa1 100644
--- a/core/fxge/android/cfpf_skiadevicemodule.cpp
+++ b/core/fxge/android/cfpf_skiadevicemodule.cpp
@@ -6,7 +6,10 @@
 
 #include "core/fxge/android/cfpf_skiadevicemodule.h"
 
+#include <utility>
+
 #include "core/fxge/android/cfpf_skiafontmgr.h"
+#include "third_party/base/ptr_util.h"
 
 namespace {
 
@@ -20,9 +23,9 @@ CFPF_SkiaDeviceModule* CFPF_GetSkiaDeviceModule() {
   return gs_pPFModule;
 }
 
-CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() {
-  delete m_pFontMgr;
-}
+CFPF_SkiaDeviceModule::CFPF_SkiaDeviceModule() {}
+
+CFPF_SkiaDeviceModule::~CFPF_SkiaDeviceModule() {}
 
 void CFPF_SkiaDeviceModule::Destroy() {
   delete gs_pPFModule;
@@ -31,11 +34,10 @@ void CFPF_SkiaDeviceModule::Destroy() {
 
 CFPF_SkiaFontMgr* CFPF_SkiaDeviceModule::GetFontMgr() {
   if (!m_pFontMgr) {
-    m_pFontMgr = new CFPF_SkiaFontMgr;
-    if (!m_pFontMgr->InitFTLibrary()) {
-      delete m_pFontMgr;
+    auto pNewMgr = pdfium::MakeUnique<CFPF_SkiaFontMgr>();
+    if (!pNewMgr->InitFTLibrary())
       return nullptr;
-    }
+    m_pFontMgr = std::move(pNewMgr);
   }
-  return m_pFontMgr;
+  return m_pFontMgr.get();
 }