Replace a few more std::unique_ptr.reset() with WrapUnique assignments.

core/fxge/ge/cfx_font.cpp

Index: core/fxge/ge/cfx_font.cpp
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp
index ce77cbf66152640dd791adaaba3458fdbe785bc3..a291b59ad4673632b9c8d70d2c39d435c5467029 100644
--- a/core/fxge/ge/cfx_font.cpp
+++ b/core/fxge/ge/cfx_font.cpp
@@ -244,7 +244,7 @@ FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
 
   m_bShallowCopy = true;
   if (pFont->m_pSubstFont) {
-    m_pSubstFont.reset(new CFX_SubstFont);
+    m_pSubstFont = WrapUnique(new CFX_SubstFont);
     m_pSubstFont->m_Charset = pFont->m_pSubstFont->m_Charset;
     m_pSubstFont->m_SubstFlags = pFont->m_pSubstFont->m_SubstFlags;
     m_pSubstFont->m_Weight = pFont->m_pSubstFont->m_Weight;
@@ -319,7 +319,7 @@ void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
                          bool bVertical) {
   m_bEmbedded = false;
   m_bVertical = bVertical;
-  m_pSubstFont.reset(new CFX_SubstFont);
+  m_pSubstFont = WrapUnique(new CFX_SubstFont);
   m_Face = CFX_GEModule::Get()->GetFontMgr()->FindSubstFont(
       face_name, bTrueType, flags, weight, italic_angle, CharsetCP,
       m_pSubstFont.get());