Index: core/fpdfdoc/cpdf_filespec_unittest.cpp |
diff --git a/core/fpdfdoc/cpdf_filespec_unittest.cpp b/core/fpdfdoc/cpdf_filespec_unittest.cpp |
index 72b073510b4d6099a1f069a6bdf0bf9381bf47c8..01989ee0bd90a7178656db5d96117195f4b53dd9 100644 |
--- a/core/fpdfdoc/cpdf_filespec_unittest.cpp |
+++ b/core/fpdfdoc/cpdf_filespec_unittest.cpp |
@@ -12,13 +12,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/test_support.h" |
-namespace { |
- |
-using ScopedObj = std::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>>; |
-using ScopedDict = |
- std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>; |
-} |
- |
TEST(cpdf_filespec, EncodeDecodeFileName) { |
std::vector<pdfium::NullTermWstrFuncTestData> test_data = { |
// Empty src string. |
@@ -74,7 +67,7 @@ TEST(cpdf_filespec, GetFileName) { |
L"/docs/test.pdf" |
#endif |
}; |
- ScopedObj str_obj(new CPDF_String(test_data.input)); |
+ std::unique_ptr<CPDF_Object> str_obj(new CPDF_String(test_data.input)); |
CPDF_FileSpec file_spec(str_obj.get()); |
CFX_WideString file_name; |
EXPECT_TRUE(file_spec.GetFileName(&file_name)); |
@@ -105,7 +98,7 @@ TEST(cpdf_filespec, GetFileName) { |
}; |
// Keyword fields in reverse order of precedence to retrieve the file name. |
const char* const keywords[5] = {"Unix", "Mac", "DOS", "F", "UF"}; |
- ScopedDict dict_obj(new CPDF_Dictionary()); |
+ std::unique_ptr<CPDF_Dictionary> dict_obj(new CPDF_Dictionary()); |
CPDF_FileSpec file_spec(dict_obj.get()); |
CFX_WideString file_name; |
for (int i = 0; i < 5; ++i) { |
@@ -122,7 +115,7 @@ TEST(cpdf_filespec, GetFileName) { |
} |
{ |
// Invalid object. |
- ScopedObj name_obj(new CPDF_Name("test.pdf")); |
+ std::unique_ptr<CPDF_Object> name_obj(new CPDF_Name("test.pdf")); |
CPDF_FileSpec file_spec(name_obj.get()); |
CFX_WideString file_name; |
EXPECT_FALSE(file_spec.GetFileName(&file_name)); |
@@ -143,7 +136,7 @@ TEST(cpdf_filespec, SetFileName) { |
#endif |
}; |
// String object. |
- ScopedObj str_obj(new CPDF_String(L"babababa")); |
+ std::unique_ptr<CPDF_Object> str_obj(new CPDF_String(L"babababa")); |
CPDF_FileSpec file_spec1(str_obj.get()); |
file_spec1.SetFileName(test_data.input); |
// Check internal object value. |
@@ -155,7 +148,7 @@ TEST(cpdf_filespec, SetFileName) { |
EXPECT_TRUE(file_name == test_data.input); |
// Dictionary object. |
- ScopedDict dict_obj(new CPDF_Dictionary()); |
+ std::unique_ptr<CPDF_Dictionary> dict_obj(new CPDF_Dictionary()); |
CPDF_FileSpec file_spec2(dict_obj.get()); |
file_spec2.SetFileName(test_data.input); |
// Check internal object value. |