Replace a few more std::unique_ptr.reset() with WrapUnique assignments.

core/fxge/dib/fx_dib_main.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 "core/fxge/include/fx_dib.h"
 
 #include <limits.h>
 #include <algorithm>
@@ skipping 1443 matching lines @@
         dest_scan--;
         src_scan++;
       }
     }
   }
   return pFlipped;
 }
 
 CFX_DIBExtractor::CFX_DIBExtractor(const CFX_DIBSource* pSrc) {
   if (pSrc->GetBuffer()) {
-    m_pBitmap.reset(new CFX_DIBitmap);
+    m_pBitmap = WrapUnique(new CFX_DIBitmap);
     if (!m_pBitmap->Create(pSrc->GetWidth(), pSrc->GetHeight(),
                            pSrc->GetFormat(), pSrc->GetBuffer())) {
       m_pBitmap.reset();
       return;
     }
     m_pBitmap->CopyPalette(pSrc->GetPalette());
     m_pBitmap->CopyAlphaMask(pSrc->m_pAlphaMask);
   } else {
     m_pBitmap.reset(pSrc->Clone());
   }
@@ skipping 85 matching lines @@
         FXSYS_fabs(m_Matrix.a) < 0.5f && FXSYS_fabs(m_Matrix.d) < 0.5f) {
       int dest_width = image_rect.Width();
       int dest_height = image_rect.Height();
       FX_RECT bitmap_clip = m_ClipBox;
       bitmap_clip.Offset(-image_rect.left, -image_rect.top);
       bitmap_clip = FXDIB_SwapClipBox(bitmap_clip, dest_width, dest_height,
                                       m_Matrix.c > 0, m_Matrix.b < 0);
       m_Composer.Compose(pDevice, pClipRgn, bitmap_alpha, mask_color, m_ClipBox,
                          TRUE, m_Matrix.c > 0, m_Matrix.b < 0, m_bRgbByteOrder,
                          alpha_flag, pIccTransform, m_BlendType);
-      m_Stretcher.reset(new CFX_ImageStretcher(&m_Composer, pSource,
-                                               dest_height, dest_width,
-                                               bitmap_clip, dib_flags));
+      m_Stretcher = WrapUnique(new CFX_ImageStretcher(&m_Composer, pSource,
+                                                      dest_height, dest_width,
+                                                      bitmap_clip, dib_flags));
       if (!m_Stretcher->Start())
         return FALSE;
 
       m_Status = 1;
       return TRUE;
     }
     m_Status = 2;
     m_pTransformer.reset(
         new CFX_ImageTransformer(pSource, &m_Matrix, dib_flags, &m_ClipBox));
     m_pTransformer->Start();
@@ skipping 10 matching lines @@
 
   if (dest_width == 0 || dest_height == 0)
     return FALSE;
 
   FX_RECT bitmap_clip = m_ClipBox;
   bitmap_clip.Offset(-image_rect.left, -image_rect.top);
   m_Composer.Compose(pDevice, pClipRgn, bitmap_alpha, mask_color, m_ClipBox,
                      FALSE, FALSE, FALSE, m_bRgbByteOrder, alpha_flag,
                      pIccTransform, m_BlendType);
   m_Status = 1;
-  m_Stretcher.reset(new CFX_ImageStretcher(
+  m_Stretcher = WrapUnique(new CFX_ImageStretcher(
       &m_Composer, pSource, dest_width, dest_height, bitmap_clip, dib_flags));
   return m_Stretcher->Start();
 }
 
 FX_BOOL CFX_ImageRenderer::Continue(IFX_Pause* pPause) {
   if (m_Status == 1)
     return m_Stretcher->Continue(pPause);
 
   if (m_Status == 2) {
     if (m_pTransformer->Continue(pPause))
@@ skipping 59 matching lines @@
   if (dest_alpha_buf) {
     FXSYS_memcpy(dest_alpha_buf, scan_extra_alpha,
                  m_pBitmap->m_pAlphaMask->GetPitch());
   }
 }
 
 FX_BOOL CFX_BitmapStorer::SetInfo(int width,
                                   int height,
                                   FXDIB_Format src_format,
                                   uint32_t* pSrcPalette) {
-  m_pBitmap.reset(new CFX_DIBitmap);
+  m_pBitmap = WrapUnique(new CFX_DIBitmap);
   if (!m_pBitmap->Create(width, height, src_format)) {
     m_pBitmap.reset();
     return FALSE;
   }
   if (pSrcPalette)
     m_pBitmap->CopyPalette(pSrcPalette);
   return TRUE;
 }