Remove NULL in xfa/

xfa/fxfa/app/xfa_ffapp.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/include/xfa_ffapp.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 91 matching lines @@
   delete m_pFontMgr;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   if (m_pFontSource)
     m_pFontSource->Release();
 #endif
   if (m_pFDEFontMgr)
     m_pFDEFontMgr->Release();
 }
 
 CXFA_FFDocHandler* CXFA_FFApp::GetDocHandler() {
-  if (!m_pDocHandler) {
+  if (!m_pDocHandler)
     m_pDocHandler = new CXFA_FFDocHandler;
-  }
   return m_pDocHandler;
 }
 CXFA_FFDoc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider,
                                   IFX_FileRead* pStream,
                                   FX_BOOL bTakeOverFile) {
-  CXFA_FFDoc* pDoc = new CXFA_FFDoc(this, pProvider);
+  std::unique_ptr<CXFA_FFDoc> pDoc(new CXFA_FFDoc(this, pProvider));
   FX_BOOL bSuccess = pDoc->OpenDoc(pStream, bTakeOverFile);
-  if (!bSuccess) {
-    delete pDoc;
-    pDoc = NULL;
-  }
-  return pDoc;
+  return bSuccess ? pDoc.release() : nullptr;
 }
+
 CXFA_FFDoc* CXFA_FFApp::CreateDoc(IXFA_DocProvider* pProvider,
                                   CPDF_Document* pPDFDoc) {
-  if (pPDFDoc == NULL) {
-    return NULL;
-  }
-  CXFA_FFDoc* pDoc = new CXFA_FFDoc(this, pProvider);
+  if (!pPDFDoc)
+    return nullptr;
+
+  std::unique_ptr<CXFA_FFDoc> pDoc(new CXFA_FFDoc(this, pProvider));
   FX_BOOL bSuccess = pDoc->OpenDoc(pPDFDoc);
-  if (!bSuccess) {
-    delete pDoc;
-    pDoc = NULL;
-  }
-  return pDoc;
+  return bSuccess ? pDoc.release() : nullptr;
 }
 
 void CXFA_FFApp::SetDefaultFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr) {
   if (!m_pFontMgr)
     m_pFontMgr = new CXFA_FontMgr();
   m_pFontMgr->SetDefFontMgr(std::move(pFontMgr));
 }
 
 CXFA_FontMgr* CXFA_FFApp::GetXFAFontMgr() {
   return m_pFontMgr;
@@ skipping 22 matching lines @@
     m_pAdapterWidgetMgr = new CXFA_FWLAdapterWidgetMgr;
     pDelegate->OnSetCapability(FWL_WGTMGR_DisableThread |
                                FWL_WGTMGR_DisableForm);
     m_pWidgetMgrDelegate = pDelegate;
   }
   return m_pAdapterWidgetMgr;
 }
 IFWL_AdapterTimerMgr* CXFA_FFApp::GetTimerMgr() {
   return m_pProvider->GetTimerMgr();
 }