Make FDF document creation return unique_ptrs

core/fpdfapi/parser/cfdf_document.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/fpdfapi/parser/cfdf_document.h"
 
 #include <memory>
 #include <utility>
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_syntax_parser.h"
 #include "third_party/base/ptr_util.h"
 
 CFDF_Document::CFDF_Document()
     : CPDF_IndirectObjectHolder(),
       m_pRootDict(nullptr),
       m_pFile(nullptr),
       m_bOwnFile(false) {}
 
 CFDF_Document::~CFDF_Document() {
   if (m_bOwnFile && m_pFile)
     m_pFile->Release();
 }
 
-CFDF_Document* CFDF_Document::CreateNewDoc() {
-  CFDF_Document* pDoc = new CFDF_Document;
+std::unique_ptr<CFDF_Document> CFDF_Document::CreateNewDoc() {
+  auto pDoc = pdfium::MakeUnique<CFDF_Document>();
   pDoc->m_pRootDict = pDoc->NewIndirect<CPDF_Dictionary>();
   pDoc->m_pRootDict->SetNewFor<CPDF_Dictionary>("FDF");
   return pDoc;
 }
 
-CFDF_Document* CFDF_Document::ParseFile(IFX_SeekableReadStream* pFile,
-                                        bool bOwnFile) {
+std::unique_ptr<CFDF_Document> CFDF_Document::ParseFile(
+    IFX_SeekableReadStream* pFile,
+    bool bOwnFile) {
   if (!pFile)
     return nullptr;
 
-  std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document);
+  auto pDoc = pdfium::MakeUnique<CFDF_Document>();
   pDoc->ParseStream(pFile, bOwnFile);
-  return pDoc->m_pRootDict ? pDoc.release() : nullptr;
+  return pDoc->m_pRootDict ? std::move(pDoc) : nullptr;
 }
 
-CFDF_Document* CFDF_Document::ParseMemory(const uint8_t* pData, uint32_t size) {
+std::unique_ptr<CFDF_Document> CFDF_Document::ParseMemory(const uint8_t* pData,
+                                                          uint32_t size) {
   return CFDF_Document::ParseFile(FX_CreateMemoryStream((uint8_t*)pData, size),
                                   true);
 }
 
 void CFDF_Document::ParseStream(IFX_SeekableReadStream* pFile, bool bOwnFile) {
   m_pFile = pFile;
   m_bOwnFile = bOwnFile;
   CPDF_SyntaxParser parser;
   parser.InitParser(m_pFile, 0);
   while (1) {
@@ skipping 41 matching lines @@
 
   buf << "%FDF-1.2\r\n";
   for (const auto& pair : *this)
     buf << pair.first << " 0 obj\r\n"
         << pair.second.get() << "\r\nendobj\r\n\r\n";
 
   buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
       << " 0 R>>\r\n%%EOF\r\n";
   return true;
 }