Merge to XFA: Return unique_ptrs from test_support functions

testing/test_support.cpp

 // Copyright 2015 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 "testing/test_support.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "testing/utils/path_service.h"
@@ skipping 53 matching lines @@
 
   // By enabling predictable mode, V8 won't post any background tasks.
   const char predictable_flag[] = "--predictable";
   v8::V8::SetFlagsFromString(predictable_flag,
                              static_cast<int>(strlen(predictable_flag)));
 }
 #endif  // PDF_ENABLE_V8
 
 }  // namespace
 
-char* GetFileContents(const char* filename, size_t* retlen) {
+std::unique_ptr<char, pdfium::FreeDeleter> GetFileContents(const char* filename,
+                                                           size_t* retlen) {
   FILE* file = fopen(filename, "rb");
   if (!file) {
     fprintf(stderr, "Failed to open: %s\n", filename);
     return nullptr;
   }
   (void)fseek(file, 0, SEEK_END);
   size_t file_length = ftell(file);
   if (!file_length) {
     return nullptr;
   }
   (void)fseek(file, 0, SEEK_SET);
-  char* buffer = (char*)malloc(file_length);
+  std::unique_ptr<char, pdfium::FreeDeleter> buffer(
+      static_cast<char*>(malloc(file_length)));
   if (!buffer) {
     return nullptr;
   }
-  size_t bytes_read = fread(buffer, 1, file_length, file);
+  size_t bytes_read = fread(buffer.get(), 1, file_length, file);
   (void)fclose(file);
   if (bytes_read != file_length) {
     fprintf(stderr, "Failed to read: %s\n", filename);
-    free(buffer);
     return nullptr;
   }
   *retlen = bytes_read;
   return buffer;
 }
 
 std::wstring GetPlatformWString(FPDF_WIDESTRING wstr) {
   if (!wstr)
     return nullptr;
 
   size_t characters = 0;
   while (wstr[characters])
     ++characters;
 
   std::wstring platform_string(characters, L'\0');
   for (size_t i = 0; i < characters + 1; ++i) {
     const unsigned char* ptr = reinterpret_cast<const unsigned char*>(&wstr[i]);
     platform_string[i] = ptr[0] + 256 * ptr[1];
   }
   return platform_string;
 }
 
-FPDF_WIDESTRING GetFPDFWideString(const std::wstring& wstr) {
+std::unique_ptr<unsigned short, pdfium::FreeDeleter> GetFPDFWideString(
+    const std::wstring& wstr) {
   size_t length = sizeof(uint16_t) * (wstr.length() + 1);
-  unsigned char* ptr = static_cast<unsigned char*>(malloc(length));
+  std::unique_ptr<unsigned short, pdfium::FreeDeleter> result(
+      static_cast<unsigned short*>(malloc(length)));
+  char* ptr = reinterpret_cast<char*>(result.get());
   size_t i = 0;
   for (wchar_t w : wstr) {
     ptr[i++] = w & 0xff;
     ptr[i++] = (w >> 8) & 0xff;
   }
   ptr[i++] = 0;
   ptr[i] = 0;
-  return reinterpret_cast<FPDF_WIDESTRING>(ptr);
+  return result;
 }
 
 #ifdef PDF_ENABLE_V8
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
 bool InitializeV8ForPDFium(const std::string& exe_path,
                            const std::string& bin_dir,
                            v8::StartupData* natives_blob,
                            v8::StartupData* snapshot_blob,
                            v8::Platform** platform) {
   InitializeV8Common(platform);
@@ skipping 22 matching lines @@
                          unsigned long pos,
                          unsigned char* pBuf,
                          unsigned long size) {
   TestLoader* pLoader = static_cast<TestLoader*>(param);
   if (pos + size < pos || pos + size > pLoader->m_Len)
     return 0;
 
   memcpy(pBuf, pLoader->m_pBuf + pos, size);
   return 1;
 }