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_text_embeddertest.cpp

diff --git a/fpdfsdk/fpdf_text_embeddertest.cpp b/fpdfsdk/fpdf_text_embeddertest.cpp
index fc9564d..37e8dfa 100644
--- a/fpdfsdk/fpdf_text_embeddertest.cpp
+++ b/fpdfsdk/fpdf_text_embeddertest.cpp
@@ -200,14 +200,10 @@
   FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
   ASSERT_TRUE(textpage);
 
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> nope =
-      GetFPDFWideString(L"nope");
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> world =
-      GetFPDFWideString(L"world");
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> world_caps =
-      GetFPDFWideString(L"WORLD");
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> world_substr =
-      GetFPDFWideString(L"orld");
+  ScopedFPDFWideString nope = GetFPDFWideString(L"nope");
+  ScopedFPDFWideString world = GetFPDFWideString(L"world");
+  ScopedFPDFWideString world_caps = GetFPDFWideString(L"WORLD");
+  ScopedFPDFWideString world_substr = GetFPDFWideString(L"orld");
 
   {
     // No occurrences of "nope" in test page.
@@ -320,8 +316,7 @@
   FPDF_TEXTPAGE textpage = FPDFText_LoadPage(page);
   ASSERT_TRUE(textpage);
 
-  std::unique_ptr<unsigned short, pdfium::FreeDeleter> aaaa =
-      GetFPDFWideString(L"aaaa");
+  ScopedFPDFWideString aaaa = GetFPDFWideString(L"aaaa");
 
   {
     // Search for "aaaa" yields 2 results in "aaaaaaaaaa".