commit f0f676814adcc37da31c0a02075725a47cd43519
author Lei Zhang <thestig@chromium.org> Mon Apr 08 17:03:21 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Mon Apr 08 17:03:21 2019 +0000
tree d844f93d65938e0b75a2625f5e08d0fdf850ea49
parent 4f556b88c6038d77e1f7b1315ef1606a88ddea09

Introduce ScopedFPDFWideString for use in tests.

It is equivalent to std::unique_ptr<FPDF_WCHAR, pdfium::FreeDeleter>.
Use it to shorten the type returned by GetFPDFWideString(). The use of
FPDF_WCHAR also makes the linter complain less about the use of unsigned
short.

Change-Id: Id32c284375151684f8457d84c4faa3fcb514f6ca
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52871
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdf_attachment_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_attachment_embeddertest.cpp b/fpdfsdk/fpdf_attachment_embeddertest.cpp
index f2fd769..59508ee 100644
--- a/fpdfsdk/fpdf_attachment_embeddertest.cpp
+++ b/fpdfsdk/fpdf_attachment_embeddertest.cpp
@@ -97,8 +97,7 @@
   EXPECT_FALSE(FPDFDoc_AddAttachment(document(), nullptr));
 
   // Add an attachment to the beginning of the embedded file list.
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> file_name =
-      GetFPDFWideString(L"0.txt");
+  ScopedFPDFWideString file_name = GetFPDFWideString(L"0.txt");
   FPDF_ATTACHMENT attachment =
       FPDFDoc_AddAttachment(document(), file_name.get());
 
@@ -160,8 +159,7 @@
   EXPECT_EQ(2, FPDFDoc_GetAttachmentCount(document()));
 
   // Add an attachment to the embedded file list.
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> file_name =
-      GetFPDFWideString(L"5.txt");
+  ScopedFPDFWideString file_name = GetFPDFWideString(L"5.txt");
   FPDF_ATTACHMENT attachment =
       FPDFDoc_AddAttachment(document(), file_name.get());
   constexpr char kContents[] = "Hello World!";
@@ -170,15 +168,13 @@
 
   // Set the date to be an arbitrary value.
   constexpr wchar_t kDateW[] = L"D:20170720161527-04'00'";
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> ws_date =
-      GetFPDFWideString(kDateW);
+  ScopedFPDFWideString ws_date = GetFPDFWideString(kDateW);
   EXPECT_TRUE(
       FPDFAttachment_SetStringValue(attachment, kDateKey, ws_date.get()));
 
   // Set the checksum to be an arbitrary value.
   constexpr wchar_t kCheckSumW[] = L"<ABCDEF01234567899876543210FEDCBA>";
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> ws_checksum =
-      GetFPDFWideString(kCheckSumW);
+  ScopedFPDFWideString ws_checksum = GetFPDFWideString(kCheckSumW);
   EXPECT_TRUE(FPDFAttachment_SetStringValue(attachment, kChecksumKey,
                                             ws_checksum.get()));