Remove some WrapUnique() calls by returing unique_ptrs

core/fpdfapi/font/cpdf_fontencoding.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_fontencoding.h"
 
 #include <utility>
 
@@ skipping 1654 matching lines @@
     for (int i = 0; i < 256; i++)
       m_Unicodes[i] = pSrc[i];
   }
 }
 
 bool CPDF_FontEncoding::IsIdentical(CPDF_FontEncoding* pAnother) const {
   return FXSYS_memcmp(m_Unicodes, pAnother->m_Unicodes, sizeof(m_Unicodes)) ==
          0;
 }
 
-CPDF_Object* CPDF_FontEncoding::Realize(CFX_WeakPtr<CFX_ByteStringPool> pPool) {
+std::unique_ptr<CPDF_Object> CPDF_FontEncoding::Realize(
+    CFX_WeakPtr<CFX_ByteStringPool> pPool) {
   int predefined = 0;
   for (int cs = PDFFONT_ENCODING_WINANSI; cs < PDFFONT_ENCODING_ZAPFDINGBATS;
        cs++) {
     const uint16_t* pSrc = PDF_UnicodesForPredefinedCharSet(cs);
     bool match = true;
     for (int i = 0; i < 256; ++i) {
       if (m_Unicodes[i] != pSrc[i]) {
         match = false;
         break;
       }
     }
     if (match) {
       predefined = cs;
       break;
     }
   }
   if (predefined) {
-    if (predefined == PDFFONT_ENCODING_WINANSI) {
-      return new CPDF_Name(pPool, "WinAnsiEncoding");
-    }
-    if (predefined == PDFFONT_ENCODING_MACROMAN) {
-      return new CPDF_Name(pPool, "MacRomanEncoding");
-    }
-    if (predefined == PDFFONT_ENCODING_MACEXPERT) {
-      return new CPDF_Name(pPool, "MacExpertEncoding");
-    }
+    if (predefined == PDFFONT_ENCODING_WINANSI)
+      return pdfium::MakeUnique<CPDF_Name>(pPool, "WinAnsiEncoding");
+    if (predefined == PDFFONT_ENCODING_MACROMAN)
+      return pdfium::MakeUnique<CPDF_Name>(pPool, "MacRomanEncoding");
+    if (predefined == PDFFONT_ENCODING_MACEXPERT)
+      return pdfium::MakeUnique<CPDF_Name>(pPool, "MacExpertEncoding");
+
     return nullptr;
   }
   const uint16_t* pStandard =
       PDF_UnicodesForPredefinedCharSet(PDFFONT_ENCODING_WINANSI);
   auto pDiff = pdfium::MakeUnique<CPDF_Array>();
   for (int i = 0; i < 256; i++) {
     if (pStandard[i] == m_Unicodes[i])
       continue;
 
     pDiff->AddNew<CPDF_Number>(i);
     pDiff->AddNew<CPDF_Name>(PDF_AdobeNameFromUnicode(m_Unicodes[i]));
   }
 
-  CPDF_Dictionary* pDict = new CPDF_Dictionary(pPool);
+  auto pDict = pdfium::MakeUnique<CPDF_Dictionary>(pPool);
   pDict->SetNewFor<CPDF_Name>("BaseEncoding", "WinAnsiEncoding");
   pDict->SetFor("Differences", std::move(pDiff));
-  return pDict;
+  return std::move(pDict);
 }
 
 uint32_t FT_CharCodeFromUnicode(int encoding, FX_WCHAR unicode) {
   switch (encoding) {
     case FXFT_ENCODING_UNICODE:
       return unicode;
     case FXFT_ENCODING_ADOBE_STANDARD:
       return PDF_FindCode(StandardEncoding, unicode);
     case FXFT_ENCODING_ADOBE_EXPERT:
       return PDF_FindCode(MacExpertEncoding, unicode);
@@ skipping 82 matching lines @@
       return MacExpertEncoding[(uint8_t)charcode];
     case FXFT_ENCODING_ADOBE_LATIN_1:
       return AdobeWinAnsiEncoding[(uint8_t)charcode];
     case FXFT_ENCODING_APPLE_ROMAN:
       return MacRomanEncoding[(uint8_t)charcode];
     case PDFFONT_ENCODING_PDFDOC:
       return PDFDocEncoding[(uint8_t)charcode];
   }
   return 0;
 }