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

core/fxcodec/jbig2/JBig2_TrdProc.cpp

 // Copyright 2015 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/fxcodec/jbig2/JBig2_TrdProc.h"
 
 #include <memory>
 
 #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
 #include "core/fxcodec/jbig2/JBig2_GrrdProc.h"
 #include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
+#include "third_party/base/ptr_util.h"
 
 CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream,
                                              JBig2ArithCtx* grContext) {
   std::unique_ptr<CJBig2_HuffmanDecoder> pHuffmanDecoder(
       new CJBig2_HuffmanDecoder(pStream));
   std::unique_ptr<CJBig2_Image> SBREG(new CJBig2_Image(SBW, SBH));
   SBREG->fill(SBDEFPIXEL);
   int32_t STRIPT;
   if (pHuffmanDecoder->decodeAValue(SBHUFFDT, &STRIPT) != 0)
     return nullptr;
@@ skipping 210 matching lines @@
     pIAFS = pIDS->IAFS;
     pIADS = pIDS->IADS;
     pIAIT = pIDS->IAIT;
     pIARI = pIDS->IARI;
     pIARDW = pIDS->IARDW;
     pIARDH = pIDS->IARDH;
     pIARDX = pIDS->IARDX;
     pIARDY = pIDS->IARDY;
     pIAID = pIDS->IAID;
   } else {
-    IADT.reset(new CJBig2_ArithIntDecoder());
-    IAFS.reset(new CJBig2_ArithIntDecoder());
-    IADS.reset(new CJBig2_ArithIntDecoder());
-    IAIT.reset(new CJBig2_ArithIntDecoder());
-    IARI.reset(new CJBig2_ArithIntDecoder());
-    IARDW.reset(new CJBig2_ArithIntDecoder());
-    IARDH.reset(new CJBig2_ArithIntDecoder());
-    IARDX.reset(new CJBig2_ArithIntDecoder());
-    IARDY.reset(new CJBig2_ArithIntDecoder());
-    IAID.reset(new CJBig2_ArithIaidDecoder(SBSYMCODELEN));
+    IADT = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IAFS = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IADS = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IAIT = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IARI = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IARDW = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IARDH = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IARDX = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IARDY = pdfium::MakeUnique<CJBig2_ArithIntDecoder>();
+    IAID = pdfium::MakeUnique<CJBig2_ArithIaidDecoder>(SBSYMCODELEN);
     pIADT = IADT.get();
     pIAFS = IAFS.get();
     pIADS = IADS.get();
     pIAIT = IAIT.get();
     pIARI = IARI.get();
     pIARDW = IARDW.get();
     pIARDH = IARDH.get();
     pIARDX = IARDX.get();
     pIARDY = IARDY.get();
     pIAID = IAID.get();
@@ skipping 133 matching lines @@
         CURS += WI - 1;
       } else if (TRANSPOSED == 1 && ((REFCORNER == JBIG2_CORNER_TOPLEFT) ||
                                      (REFCORNER == JBIG2_CORNER_TOPRIGHT))) {
         CURS += HI - 1;
       }
       ++NINSTANCES;
     }
   }
   return SBREG.release();
 }