Revert of Remove CPDF_Object::Release() in favor of direct delete

core/fpdfdoc/cpdf_filespec_unittest.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.
 
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/cpdf_name.h"
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfdoc/cpdf_filespec.h"
 #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.
     {L"", L""},
     // only file name.
     {L"test.pdf", L"test.pdf"},
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     // With drive identifier.
     {L"r:\\pdfdocs\\spec.pdf", L"/r/pdfdocs/spec.pdf"},
     // Relative path.
@@ skipping 35 matching lines @@
       L"/C/docs/test.pdf",
       L"C:\\docs\\test.pdf"
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
       L"/Mac HD/docs/test.pdf",
       L"Mac HD:docs:test.pdf"
 #else
       L"/docs/test.pdf",
       L"/docs/test.pdf"
 #endif
     };
-    std::unique_ptr<CPDF_Object> str_obj(new CPDF_String(test_data.input));
+    ScopedObj 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));
     EXPECT_TRUE(file_name == test_data.expected);
   }
   {
     // Dictionary object.
     pdfium::NullTermWstrFuncTestData test_data[5] = {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
       {L"/C/docs/test.pdf", L"C:\\docs\\test.pdf"},
@@ skipping 10 matching lines @@
 #else
       {L"/docs/a/test.pdf", L"/docs/a/test.pdf"},
       {L"/docs/b/test.pdf", L"/docs/b/test.pdf"},
       {L"/docs/c/test.pdf", L"/docs/c/test.pdf"},
       {L"/docs/d/test.pdf", L"/docs/d/test.pdf"},
       {L"/docs/e/test.pdf", L"/docs/e/test.pdf"},
 #endif
     };
     // Keyword fields in reverse order of precedence to retrieve the file name.
     const char* const keywords[5] = {"Unix", "Mac", "DOS", "F", "UF"};
-    std::unique_ptr<CPDF_Dictionary> dict_obj(new CPDF_Dictionary());
+    ScopedDict dict_obj(new CPDF_Dictionary());
     CPDF_FileSpec file_spec(dict_obj.get());
     CFX_WideString file_name;
     for (int i = 0; i < 5; ++i) {
       dict_obj->SetFor(keywords[i], new CPDF_String(test_data[i].input));
       EXPECT_TRUE(file_spec.GetFileName(&file_name));
       EXPECT_TRUE(file_name == test_data[i].expected);
     }
 
     // With all the former fields and 'FS' field suggests 'URL' type.
     dict_obj->SetStringFor("FS", "URL");
     EXPECT_TRUE(file_spec.GetFileName(&file_name));
     // Url string is not decoded.
     EXPECT_TRUE(file_name == test_data[4].input);
   }
   {
     // Invalid object.
-    std::unique_ptr<CPDF_Object> name_obj(new CPDF_Name("test.pdf"));
+    ScopedObj 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));
   }
 }
 
 TEST(cpdf_filespec, SetFileName) {
   pdfium::NullTermWstrFuncTestData test_data = {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     L"C:\\docs\\test.pdf",
     L"/C/docs/test.pdf"
 #elif _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
     L"Mac HD:docs:test.pdf",
     L"/Mac HD/docs/test.pdf"
 #else
     L"/docs/test.pdf",
     L"/docs/test.pdf"
 #endif
   };
   // String object.
-  std::unique_ptr<CPDF_Object> str_obj(new CPDF_String(L"babababa"));
+  ScopedObj str_obj(new CPDF_String(L"babababa"));
   CPDF_FileSpec file_spec1(str_obj.get());
   file_spec1.SetFileName(test_data.input);
   // Check internal object value.
   CFX_ByteString str = CFX_ByteString::FromUnicode(test_data.expected);
   EXPECT_TRUE(str == str_obj->GetString());
   // Check we can get the file name back.
   CFX_WideString file_name;
   EXPECT_TRUE(file_spec1.GetFileName(&file_name));
   EXPECT_TRUE(file_name == test_data.input);
 
   // Dictionary object.
-  std::unique_ptr<CPDF_Dictionary> dict_obj(new CPDF_Dictionary());
+  ScopedDict dict_obj(new CPDF_Dictionary());
   CPDF_FileSpec file_spec2(dict_obj.get());
   file_spec2.SetFileName(test_data.input);
   // Check internal object value.
   file_name = dict_obj->GetUnicodeTextFor("F");
   EXPECT_TRUE(file_name == test_data.expected);
   file_name = dict_obj->GetUnicodeTextFor("UF");
   EXPECT_TRUE(file_name == test_data.expected);
   // Check we can get the file name back.
   EXPECT_TRUE(file_spec2.GetFileName(&file_name));
   EXPECT_TRUE(file_name == test_data.input);
 }