Revert "Update CPDF_IndirectObjectHolder APIs for unique objects."

core/fpdfapi/parser/cpdf_dictionary.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_dictionary.h"
 
 #include <set>
 #include <utility>
@@ skipping 170 matching lines @@
   m_Map[key] = UniqueObject(pObj);
 }
 
 void CPDF_Dictionary::ConvertToIndirectObjectFor(
     const CFX_ByteString& key,
     CPDF_IndirectObjectHolder* pHolder) {
   auto it = m_Map.find(key);
   if (it == m_Map.end() || it->second->IsReference())
     return;
 
-  CPDF_Object* pObj = pHolder->AddIndirectObject(std::move(it->second));
-  it->second = UniqueReference(new CPDF_Reference(pHolder, pObj->GetObjNum()));
+  uint32_t objnum = pHolder->AddIndirectObject(it->second.release());
+  it->second = UniqueReference(new CPDF_Reference(pHolder, objnum));
 }
 
 void CPDF_Dictionary::RemoveFor(const CFX_ByteString& key) {
   m_Map.erase(key);
 }
 
 void CPDF_Dictionary::ReplaceKey(const CFX_ByteString& oldkey,
                                  const CFX_ByteString& newkey) {
   if (oldkey == newkey)
     return;
@@ skipping 19 matching lines @@
                                    const CFX_ByteString& str) {
   SetFor(key, new CPDF_String(MaybeIntern(str), FALSE));
 }
 
 void CPDF_Dictionary::SetReferenceFor(const CFX_ByteString& key,
                                       CPDF_IndirectObjectHolder* pDoc,
                                       uint32_t objnum) {
   SetFor(key, new CPDF_Reference(pDoc, objnum));
 }
 
-void CPDF_Dictionary::SetReferenceFor(const CFX_ByteString& key,
-                                      CPDF_IndirectObjectHolder* pDoc,
-                                      const CPDF_Object* pObj) {
-  SetReferenceFor(key, pDoc, pObj->GetObjNum());
-}
-
 void CPDF_Dictionary::SetNumberFor(const CFX_ByteString& key, FX_FLOAT f) {
   SetFor(key, new CPDF_Number(f));
 }
 
 void CPDF_Dictionary::SetBooleanFor(const CFX_ByteString& key, bool bValue) {
   SetFor(key, new CPDF_Boolean(bValue));
 }
 
 void CPDF_Dictionary::SetRectFor(const CFX_ByteString& key,
                                  const CFX_FloatRect& rect) {
@@ skipping 13 matching lines @@
   pArray->AddNumber(matrix.c);
   pArray->AddNumber(matrix.d);
   pArray->AddNumber(matrix.e);
   pArray->AddNumber(matrix.f);
   SetFor(key, pArray);
 }
 
 CFX_ByteString CPDF_Dictionary::MaybeIntern(const CFX_ByteString& str) {
   return m_pPool ? m_pPool->Intern(str) : str;
 }