Use unique_ptr for CXFA_XMLParser.

xfa/fxfa/parser/cxfa_simple_parser.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 "xfa/fxfa/parser/cxfa_simple_parser.h"
 
+#include <utility>
+
 #include "core/fxcrt/fx_ext.h"
 #include "third_party/base/ptr_util.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fxfa/fxfa.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_widetextread.h"
 #include "xfa/fxfa/parser/cxfa_xml_parser.h"
 #include "xfa/fxfa/parser/xfa_basic_data.h"
 #include "xfa/fxfa/parser/xfa_utils.h"
 #include "xfa/fxfa/xfa_checksum.h"
@@ skipping 267 matching lines @@
   m_pStream = IFGAS_Stream::CreateStream(
       pStream, FX_STREAMACCESS_Read | FX_STREAMACCESS_Text);
   if (!m_pStream)
     return XFA_PARSESTATUS_StreamErr;
 
   uint16_t wCodePage = m_pStream->GetCodePage();
   if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE &&
       wCodePage != FX_CODEPAGE_UTF8) {
     m_pStream->SetCodePage(FX_CODEPAGE_UTF8);
   }
-  m_pXMLDoc.reset(new CFDE_XMLDoc);
-  m_pXMLParser = new CXFA_XMLParser(m_pXMLDoc->GetRoot(), m_pStream);
-  if (!m_pXMLDoc->LoadXML(m_pXMLParser))
+  m_pXMLDoc = pdfium::MakeUnique<CFDE_XMLDoc>();
+  auto pNewParser =
+      pdfium::MakeUnique<CXFA_XMLParser>(m_pXMLDoc->GetRoot(), m_pStream);
+  m_pXMLParser = pNewParser.get();
+  if (!m_pXMLDoc->LoadXML(std::move(pNewParser)))
     return XFA_PARSESTATUS_StatusErr;
 
   m_ePacketID = ePacketID;
   return XFA_PARSESTATUS_Ready;
 }
 
 int32_t CXFA_SimpleParser::DoParse(IFX_Pause* pPause) {
   if (!m_pXMLDoc || m_ePacketID == XFA_XDPPACKET_UNKNOWN)
     return XFA_PARSESTATUS_StatusErr;
 
@@ skipping 10 matching lines @@
     return XFA_PARSESTATUS_StatusErr;
 
   return XFA_PARSESTATUS_Done;
 }
 
 int32_t CXFA_SimpleParser::ParseXMLData(const CFX_WideString& wsXML,
                                         CFDE_XMLNode*& pXMLNode,
                                         IFX_Pause* pPause) {
   CloseParser();
   pXMLNode = nullptr;
-
+  m_pXMLDoc = pdfium::MakeUnique<CFDE_XMLDoc>();
   auto pStream = pdfium::MakeRetain<CXFA_WideTextRead>(wsXML);
-  m_pXMLDoc = pdfium::MakeUnique<CFDE_XMLDoc>();
-  CXFA_XMLParser* pParser = new CXFA_XMLParser(m_pXMLDoc->GetRoot(), pStream);
+  auto pParser =
+      pdfium::MakeUnique<CXFA_XMLParser>(m_pXMLDoc->GetRoot(), pStream);
   pParser->m_dwCheckStatus = 0x03;
-  if (!m_pXMLDoc->LoadXML(pParser))
+  if (!m_pXMLDoc->LoadXML(std::move(pParser)))
     return XFA_PARSESTATUS_StatusErr;
 
   int32_t iRet = m_pXMLDoc->DoLoad(pPause);
   if (iRet < 0 || iRet >= 100)
     m_pXMLDoc->CloseXML();
   if (iRet < 0)
     return XFA_PARSESTATUS_SyntaxErr;
   if (iRet < 100)
     return iRet / 2;
 
@@ skipping 956 matching lines @@
         pXFANode->GetDocument()->SetFlag(XFA_DOCFLAG_StrictScoping, true);
       }
     }
   }
 }
 
 void CXFA_SimpleParser::CloseParser() {
   m_pXMLDoc.reset();
   m_pStream.Reset();
 }