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

xfa/fxfa/app/xfa_textlayout.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/app/xfa_textlayout.h"
 
 #include <algorithm>
 
 #include "core/fxcrt/fx_ext.h"
+#include "third_party/base/ptr_util.h"
 #include "third_party/base/stl_util.h"
 #include "xfa/fde/cfde_path.h"
 #include "xfa/fde/css/fde_csscache.h"
 #include "xfa/fde/css/fde_cssstyleselector.h"
 #include "xfa/fde/fde_gedevice.h"
 #include "xfa/fde/fde_object.h"
 #include "xfa/fde/xml/fde_xml_imp.h"
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fxfa/app/xfa_ffwidgetacc.h"
 #include "xfa/fxfa/parser/cxfa_measurement.h"
@@ skipping 68 matching lines @@
   m_pAllocator.reset();
 }
 void CXFA_TextParser::InitCSSData(CXFA_TextProvider* pTextProvider) {
   if (!pTextProvider)
     return;
 
   if (!m_pSelector) {
     CXFA_FFDoc* pDoc = pTextProvider->GetDocNode();
     CFGAS_FontMgr* pFontMgr = pDoc->GetApp()->GetFDEFontMgr();
     ASSERT(pFontMgr);
-    m_pSelector.reset(new CFDE_CSSStyleSelector(pFontMgr));
+    m_pSelector = pdfium::MakeUnique<CFDE_CSSStyleSelector>(pFontMgr);
     FX_FLOAT fFontSize = 10;
     CXFA_Font font = pTextProvider->GetFontNode();
     if (font) {
       fFontSize = font.GetFontSize();
     }
     m_pSelector->SetDefFontSize(fFontSize);
   }
   if (!m_pUASheet) {
     m_pUASheet = LoadDefaultSheetStyle();
     m_pSelector->SetStyleSheet(FDE_CSSSTYLESHEETGROUP_UserAgent, m_pUASheet);
@@ skipping 778 matching lines @@
       }
     }
     m_pBreak->SetLineBoundary(fStart, fLineWidth);
     FX_FLOAT fIndent = pParaStyle->GetTextIndent().GetValue();
     if (fIndent > 0) {
       fStart += fIndent;
     }
     m_pBreak->SetLineStartPos(fStart);
     m_pBreak->SetTabWidth(m_textParser.GetTabInterval(pStyle));
     if (!m_pTabstopContext)
-      m_pTabstopContext.reset(new CXFA_TextTabstopsContext);
+      m_pTabstopContext = pdfium::MakeUnique<CXFA_TextTabstopsContext>();
     m_textParser.GetTabstops(pStyle, m_pTabstopContext.get());
     for (int32_t i = 0; i < m_pTabstopContext->m_iTabCount; i++) {
       XFA_TABSTOPS* pTab = m_pTabstopContext->m_tabstops.GetDataPtr(i);
       m_pBreak->AddPositionedTab(pTab->fTabstops);
     }
   }
   FX_FLOAT fFontSize = m_textParser.GetFontSize(m_pTextProvider, pStyle);
   m_pBreak->SetFontSize(fFontSize);
   m_pBreak->SetLineBreakTolerance(fFontSize * 0.2f);
   m_pBreak->SetFont(m_textParser.GetFont(m_pTextProvider, pStyle));
@@ skipping 29 matching lines @@
   if (fHeight < 0.1f) {
     fHeight = 0;
     for (int32_t i = 0; i < iCount; i++) {
       fHeight += m_pLoader->m_lineHeights.ElementAt(i);
     }
   }
   return fHeight;
 }
 FX_FLOAT CXFA_TextLayout::StartLayout(FX_FLOAT fWidth) {
   if (!m_pLoader)
-    m_pLoader.reset(new CXFA_LoaderContext);
+    m_pLoader = pdfium::MakeUnique<CXFA_LoaderContext>();
 
   if (fWidth < 0 || (m_pLoader->m_fWidth > -1 &&
                      FXSYS_fabs(fWidth - m_pLoader->m_fWidth) > 0)) {
     m_pLoader->m_lineHeights.RemoveAll();
     m_Blocks.RemoveAll();
     Unload();
     m_pLoader->m_fStartLineOffset = 0;
   }
   m_pLoader->m_fWidth = fWidth;
   if (fWidth < 0) {
@@ skipping 1135 matching lines @@
   m_tabstops.RemoveAll();
   m_iTabCount = 0;
 }
 
 void CXFA_TextTabstopsContext::Reset() {
   m_iTabIndex = -1;
   m_bTabstops = false;
   m_fTabWidth = 0;
   m_fLeft = 0;
 }