Avoid the ptr.reset(new XXX()) anti-pattern

core/fpdfapi/font/cpdf_font.cpp

 // Copyright 2016 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/fpdfapi/font/cpdf_font.h"
 
 #include <memory>
 #include <utility>
@@ skipping 261 matching lines @@
     m_Descent = rect.bottom == rect.top ? m_FontBBox.bottom : rect.bottom;
   }
 }
 
 void CPDF_Font::LoadUnicodeMap() const {
   m_bToUnicodeLoaded = true;
   CPDF_Stream* pStream = m_pFontDict->GetStreamFor("ToUnicode");
   if (!pStream) {
     return;
   }
-  m_pToUnicodeMap.reset(new CPDF_ToUnicodeMap);
+  m_pToUnicodeMap = pdfium::MakeUnique<CPDF_ToUnicodeMap>();
   m_pToUnicodeMap->Load(pStream);
 }
 
 int CPDF_Font::GetStringWidth(const FX_CHAR* pString, int size) {
   int offset = 0;
   int width = 0;
   while (offset < size) {
     uint32_t charcode = GetNextChar(pString, size, offset);
     width += GetCharWidthF(charcode);
   }
@@ skipping 24 matching lines @@
 std::unique_ptr<CPDF_Font> CPDF_Font::Create(CPDF_Document* pDoc,
                                              CPDF_Dictionary* pFontDict) {
   CFX_ByteString type = pFontDict->GetStringFor("Subtype");
   std::unique_ptr<CPDF_Font> pFont;
   if (type == "TrueType") {
     CFX_ByteString tag = pFontDict->GetStringFor("BaseFont").Left(4);
     for (size_t i = 0; i < FX_ArraySize(kChineseFontNames); ++i) {
       if (tag == CFX_ByteString(kChineseFontNames[i], 4)) {
         CPDF_Dictionary* pFontDesc = pFontDict->GetDictFor("FontDescriptor");
         if (!pFontDesc || !pFontDesc->KeyExist("FontFile2"))
-          pFont.reset(new CPDF_CIDFont);
+          pFont = pdfium::MakeUnique<CPDF_CIDFont>();
         break;
       }
     }
     if (!pFont)
-      pFont.reset(new CPDF_TrueTypeFont);
+      pFont = pdfium::MakeUnique<CPDF_TrueTypeFont>();
   } else if (type == "Type3") {
-    pFont.reset(new CPDF_Type3Font);
+    pFont = pdfium::MakeUnique<CPDF_Type3Font>();
   } else if (type == "Type0") {
-    pFont.reset(new CPDF_CIDFont);
+    pFont = pdfium::MakeUnique<CPDF_CIDFont>();
   } else {
-    pFont.reset(new CPDF_Type1Font);
+    pFont = pdfium::MakeUnique<CPDF_Type1Font>();
   }
   pFont->m_pFontDict = pFontDict;
   pFont->m_pDocument = pDoc;
   pFont->m_BaseFont = pFontDict->GetStringFor("BaseFont");
   return pFont->Load() ? std::move(pFont) : nullptr;
 }
 
 uint32_t CPDF_Font::GetNextChar(const FX_CHAR* pString,
                                 int nStrLen,
                                 int& offset) const {
@@ skipping 115 matching lines @@
   if (fallbackFont < 0 ||
       fallbackFont >= pdfium::CollectionSize<int>(m_FontFallbacks)) {
     return -1;
   }
   int glyph =
       FXFT_Get_Char_Index(m_FontFallbacks[fallbackFont]->GetFace(), charcode);
   if (glyph == 0 || glyph == 0xffff)
     return -1;
   return glyph;
 }