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

core/fxge/ge/cfx_font.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/include/fx_font.h"
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fxge/ge/fx_text_int.h"
@@ skipping 226 matching lines @@
       m_bVertical(false) {
 }
 
 #ifdef PDF_ENABLE_XFA
 FX_BOOL CFX_Font::LoadClone(const CFX_Font* pFont) {
   if (!pFont)
     return FALSE;
 
   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;
     m_pSubstFont->m_Family = pFont->m_pSubstFont->m_Family;
     m_pSubstFont->m_ItalicAngle = pFont->m_pSubstFont->m_ItalicAngle;
   }
   if (pFont->m_OtfFontData.GetSize()) {
     m_OtfFontData.AttachData(pFont->m_OtfFontData.GetBuffer(),
                              pFont->m_OtfFontData.GetSize());
   }
@@ skipping 54 matching lines @@
 
 void CFX_Font::LoadSubst(const CFX_ByteString& face_name,
                          FX_BOOL bTrueType,
                          uint32_t flags,
                          int weight,
                          int italic_angle,
                          int CharsetCP,
                          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());
   if (m_Face) {
     m_pFontData = FXFT_Get_Face_Stream_Base(m_Face);
     m_dwSize = FXFT_Get_Face_Stream_Size(m_Face);
   }
 }
 
 #ifdef PDF_ENABLE_XFA
@@ skipping 372 matching lines @@
 const CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index,
                                             int dest_width) const {
   return GetFaceCache()->LoadGlyphPath(this, glyph_index, dest_width);
 }
 
 #ifdef _SKIA_SUPPORT_
 CFX_TypeFace* CFX_Font::GetDeviceCache() const {
   return GetFaceCache()->GetDeviceCache(this);
 }
 #endif