Add FilePath support to FileVersionInfo, fix Mac memory issues.

base/file_version_info.cc

 // Copyright (c) 2006-2008 The Chromium 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 <windows.h>
 
 #include "base/file_version_info.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 22 matching lines @@
 FileVersionInfo* FileVersionInfo::CreateFileVersionInfoForCurrentModule() {
   std::wstring app_path;
   if (!PathService::Get(base::FILE_MODULE, &app_path))
     return NULL;
 
   return CreateFileVersionInfo(app_path);
 }
 
 // static
 FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
-    const std::wstring& file_path) {
+    const FilePath& file_path) {
   DWORD dummy;
-  const wchar_t* path = file_path.c_str();
+  const wchar_t* path = file_path.value().c_str();
   DWORD length = ::GetFileVersionInfoSize(path, &dummy);
   if (length == 0)
     return NULL;
 
   void* data = calloc(length, 1);
   if (!data)
     return NULL;
 
   if (!::GetFileVersionInfo(path, dummy, length, data)) {
     free(data);
     return NULL;
   }
 
   LanguageAndCodePage* translate = NULL;
   uint32 page_count;
   BOOL query_result = VerQueryValue(data, L"\\VarFileInfo\\Translation",
                                    (void**) &translate, &page_count);
 
   if (query_result && translate) {
     return new FileVersionInfo(data, translate->language,
                                translate->code_page);
 
   } else {
     free(data);
     return NULL;
   }
 }
 
+FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
+    const std::wstring& file_path) {
+  FilePath file_path_fp = FilePath::FromWStringHack(file_path);
+  return CreateFileVersionInfo(file_path_fp);
+}
+
 std::wstring FileVersionInfo::company_name() {
   return GetStringValue(L"CompanyName");
 }
 
 std::wstring FileVersionInfo::company_short_name() {
   return GetStringValue(L"CompanyShortName");
 }
 
 std::wstring FileVersionInfo::internal_name() {
   return GetStringValue(L"InternalName");
@@ skipping 88 matching lines @@
 
 std::wstring FileVersionInfo::GetStringValue(const wchar_t* name) {
   std::wstring str;
   if (GetValue(name, &str))
     return str;
   else
     return L"";
 }