Revert "Update CPDF_IndirectObjectHolder APIs for unique objects."

core/fpdfapi/parser/cpdf_array.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/parser/cpdf_array.h"
 
 #include <set>
 
@@ skipping 134 matching lines @@
 }
 
 void CPDF_Array::ConvertToIndirectObjectAt(size_t i,
                                            CPDF_IndirectObjectHolder* pHolder) {
   if (i >= m_Objects.size())
     return;
 
   if (!m_Objects[i] || m_Objects[i]->IsReference())
     return;
 
-  CPDF_Object* pUnowned = pHolder->AddIndirectObject(std::move(m_Objects[i]));
-  m_Objects[i] =
-      UniqueObject(new CPDF_Reference(pHolder, pUnowned->GetObjNum()));
+  uint32_t dwObjNum = pHolder->AddIndirectObject(m_Objects[i].release());
+  m_Objects[i] = UniqueObject(new CPDF_Reference(pHolder, dwObjNum));
 }
 
 void CPDF_Array::SetAt(size_t i, CPDF_Object* pObj) {
   ASSERT(IsArray());
   CHECK(!pObj || pObj->IsInline());
   if (i >= m_Objects.size()) {
     ASSERT(false);
     return;
   }
   m_Objects[i] = UniqueObject(pObj);
@@ skipping 31 matching lines @@
 }
 
 void CPDF_Array::AddNumber(FX_FLOAT f) {
   Add(new CPDF_Number(f));
 }
 
 void CPDF_Array::AddReference(CPDF_IndirectObjectHolder* pDoc,
                               uint32_t objnum) {
   Add(new CPDF_Reference(pDoc, objnum));
 }
-
-void CPDF_Array::AddReference(CPDF_IndirectObjectHolder* pDoc,
-                              const CPDF_Object* pObj) {
-  AddReference(pDoc, pObj->GetObjNum());
-}