Use more unique_ptrs in CPDF_Image.

core/fpdfapi/page/cpdf_image.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 "core/fpdfapi/page/cpdf_image.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 43 matching lines @@
 
 void CPDF_Image::FinishInitialization() {
   m_pOC = m_pDict->GetDictFor("OC");
   m_bIsMask =
       !m_pDict->KeyExist("ColorSpace") || m_pDict->GetIntegerFor("ImageMask");
   m_bInterpolate = !!m_pDict->GetIntegerFor("Interpolate");
   m_Height = m_pDict->GetIntegerFor("Height");
   m_Width = m_pDict->GetIntegerFor("Width");
 }
 
-CPDF_Image* CPDF_Image::Clone() {
-  CPDF_Image* pImage = new CPDF_Image(m_pDocument);
-  pImage->m_bIsInline = m_bIsInline;
-  if (m_pOwnedStream) {
-    pImage->m_pOwnedStream = ToStream(m_pOwnedStream->Clone());
-    pImage->m_pStream = pImage->m_pOwnedStream.get();
-  } else {
-    pImage->m_pStream = m_pStream;
-  }
-  if (m_pOwnedDict) {
-    pImage->m_pOwnedDict = ToDictionary(m_pOwnedDict->Clone());
-    pImage->m_pDict = pImage->m_pOwnedDict.get();
-  } else {
-    pImage->m_pDict = m_pDict;
-  }
-  return pImage;
-}
-
 void CPDF_Image::ConvertStreamToIndirectObject() {
   if (!m_pStream->IsInline())
     return;
 
   ASSERT(m_pOwnedStream);
   m_pDocument->AddIndirectObject(std::move(m_pOwnedStream));
 }
 
 std::unique_ptr<CPDF_Dictionary> CPDF_Image::InitJPEG(uint8_t* pData,
                                                       uint32_t size) {
@@ skipping 230 matching lines @@
 
 void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap) {
   pPage->GetRenderCache()->ResetBitmap(m_pStream, pBitmap);
 }
 
 CFX_DIBSource* CPDF_Image::LoadDIBSource(CFX_DIBSource** ppMask,
                                          uint32_t* pMatteColor,
                                          bool bStdCS,
                                          uint32_t GroupFamily,
                                          bool bLoadMask) const {
-  std::unique_ptr<CPDF_DIBSource> source(new CPDF_DIBSource);
+  auto source = pdfium::MakeUnique<CPDF_DIBSource>();
   if (source->Load(m_pDocument, m_pStream,
                    reinterpret_cast<CPDF_DIBSource**>(ppMask), pMatteColor,
                    nullptr, nullptr, bStdCS, GroupFamily, bLoadMask)) {
     return source.release();
   }
   return nullptr;
 }
 
 CFX_DIBSource* CPDF_Image::DetachBitmap() {
   CFX_DIBSource* pBitmap = m_pDIBSource;
   m_pDIBSource = nullptr;
   return pBitmap;
 }
 
 CFX_DIBSource* CPDF_Image::DetachMask() {
   CFX_DIBSource* pBitmap = m_pMask;
   m_pMask = nullptr;
   return pBitmap;
 }
 
 bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource,
                                     CPDF_Dictionary* pPageResource,
                                     bool bStdCS,
                                     uint32_t GroupFamily,
                                     bool bLoadMask) {
-  std::unique_ptr<CPDF_DIBSource> source(new CPDF_DIBSource);
+  auto source = pdfium::MakeUnique<CPDF_DIBSource>();
   int ret =
       source->StartLoadDIBSource(m_pDocument, m_pStream, true, pFormResource,
                                  pPageResource, bStdCS, GroupFamily, bLoadMask);
   if (ret == 2) {
     m_pDIBSource = source.release();
     return true;
   }
   if (!ret) {
     m_pDIBSource = nullptr;
     return false;
@@ skipping 12 matching lines @@
   }
   if (!ret) {
     delete m_pDIBSource;
     m_pDIBSource = nullptr;
     return false;
   }
   m_pMask = pSource->DetachMask();
   m_MatteColor = pSource->GetMatteColor();
   return false;
 }