Index: core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp |
diff --git a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp |
index a77f022c405d732359c640f71222a274c8679832..4f65ee1410887929a403cb9cdb6cf0a45524eecf 100644 |
--- a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp |
+++ b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp |
@@ -92,7 +92,7 @@ class PDFObjectsTest : public testing::Test { |
m_DirectObjs.emplace_back(objs[i]); |
// Indirect references to indirect objects. |
- m_ObjHolder.reset(new CPDF_IndirectObjectHolder(nullptr)); |
+ m_ObjHolder.reset(new CPDF_IndirectObjectHolder()); |
m_IndirectObjs = {boolean_true_obj, number_int_obj, str_spec_obj, name_obj, |
m_ArrayObj, m_DictObj, stream_obj}; |
for (size_t i = 0; i < m_IndirectObjs.size(); ++i) { |
@@ -710,7 +710,7 @@ TEST(PDFArrayTest, AddStringAndName) { |
TEST(PDFArrayTest, AddReferenceAndGetObjectAt) { |
std::unique_ptr<CPDF_IndirectObjectHolder> holder( |
- new CPDF_IndirectObjectHolder(nullptr)); |
+ new CPDF_IndirectObjectHolder()); |
CPDF_Boolean* boolean_obj = new CPDF_Boolean(true); |
CPDF_Number* int_obj = new CPDF_Number(-1234); |
CPDF_Number* float_obj = new CPDF_Number(2345.089f); |
@@ -725,13 +725,14 @@ TEST(PDFArrayTest, AddReferenceAndGetObjectAt) { |
// Create two arrays of references by different AddReference() APIs. |
for (size_t i = 0; i < FX_ArraySize(indirect_objs); ++i) { |
// All the indirect objects inserted will be owned by holder. |
- holder->InsertIndirectObject(obj_nums[i], indirect_objs[i]); |
+ holder->ReplaceIndirectObjectIfHigherGeneration(obj_nums[i], |
+ indirect_objs[i]); |
arr->AddReference(holder.get(), obj_nums[i]); |
arr1->AddReference(holder.get(), indirect_objs[i]); |
} |
// Check indirect objects. |
for (size_t i = 0; i < FX_ArraySize(obj_nums); ++i) |
- EXPECT_EQ(indirect_objs[i], holder->GetIndirectObject(obj_nums[i])); |
+ EXPECT_EQ(indirect_objs[i], holder->GetIndirectObjectIfValid(obj_nums[i])); |
// Check arrays. |
EXPECT_EQ(arr->GetCount(), arr1->GetCount()); |
for (size_t i = 0; i < arr->GetCount(); ++i) { |