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

xfa/fxfa/app/xfa_ffdoc.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 "xfa/fxfa/xfa_ffdoc.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_document.h"
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
 #include "core/fpdfdoc/cpdf_nametree.h"
 #include "core/fxcrt/fx_ext.h"
 #include "core/fxcrt/fx_memory.h"
+#include "third_party/base/ptr_util.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fwl/cfwl_notedriver.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_dataexporter.h"
 #include "xfa/fxfa/parser/cxfa_dataimporter.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/xfa_checksum.h"
 #include "xfa/fxfa/xfa_ffapp.h"
 #include "xfa/fxfa/xfa_ffdocview.h"
 #include "xfa/fxfa/xfa_ffwidget.h"
@@ skipping 130 matching lines @@
 
 CXFA_FFDoc::~CXFA_FFDoc() {
   CloseDoc();
 }
 
 uint32_t CXFA_FFDoc::GetDocType() {
   return m_dwDocType;
 }
 
 int32_t CXFA_FFDoc::StartLoad() {
-  m_pNotify.reset(new CXFA_FFNotify(this));
-  m_pDocumentParser.reset(new CXFA_DocumentParser(m_pNotify.get()));
-  int32_t iStatus = m_pDocumentParser->StartParse(m_pStream, XFA_XDPPACKET_XDP);
-  return iStatus;
+  m_pNotify = pdfium::MakeUnique<CXFA_FFNotify>(this);
+  m_pDocumentParser = pdfium::MakeUnique<CXFA_DocumentParser>(m_pNotify.get());
+  return m_pDocumentParser->StartParse(m_pStream, XFA_XDPPACKET_XDP);
 }
 
 bool XFA_GetPDFContentsFromPDFXML(CFDE_XMLNode* pPDFElement,
                                   uint8_t*& pByteBuffer,
                                   int32_t& iBufferSize) {
   CFDE_XMLElement* pDocumentElement = nullptr;
   for (CFDE_XMLNode* pXMLNode =
            pPDFElement->GetNodeItem(CFDE_XMLNode::FirstChild);
        pXMLNode; pXMLNode = pXMLNode->GetNodeItem(CFDE_XMLNode::NextSibling)) {
     if (pXMLNode->GetType() == FDE_XMLNODE_Element) {
@@ skipping 82 matching lines @@
     return;
   }
   CFX_WideString wsType;
   if (pDynamicRender->TryContent(wsType) && wsType == FX_WSTRC(L"required")) {
     m_dwDocType = XFA_DOCTYPE_Dynamic;
   }
 }
 
 CXFA_FFDocView* CXFA_FFDoc::CreateDocView(uint32_t dwView) {
   if (!m_TypeToDocViewMap[dwView])
-    m_TypeToDocViewMap[dwView].reset(new CXFA_FFDocView(this));
+    m_TypeToDocViewMap[dwView] = pdfium::MakeUnique<CXFA_FFDocView>(this);
 
   return m_TypeToDocViewMap[dwView].get();
 }
 
 CXFA_FFDocView* CXFA_FFDoc::GetDocView(CXFA_LayoutProcessor* pLayout) {
   for (const auto& pair : m_TypeToDocViewMap) {
     if (pair.second->GetXFALayout() == pLayout)
       return pair.second.get();
   }
   return nullptr;
@@ skipping 146 matching lines @@
       pFile, pNode, 0, bsChecksum.GetLength() ? bsChecksum.c_str() : nullptr);
 }
 
 bool CXFA_FFDoc::ImportData(
     const CFX_RetainPtr<IFX_SeekableReadStream>& pStream,
     bool bXDP) {
   auto importer =
       pdfium::MakeUnique<CXFA_DataImporter>(m_pDocumentParser->GetDocument());
   return importer->ImportData(pStream);
 }