Copy the relevant parts of ICU to a new file base/third_party/icu/icu_utf.*

so we can do basic UTF8/16/32 conversions without linking all of ICU.

Change callers who used to call SysUTF8ToWide/SysWideToUTF8 in base to using
these new functions. I will remove the Sys versions of these functions in a
later patch.

TEST=none
BUG=none
Review URL: http://codereview.chromium.org/243102

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28219 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 10 deletions

diff --git a/base/file_version_info_mac.mm b/base/file_version_info_mac.mm
index ae6603f..f177bca 100644
--- a/base/file_version_info_mac.mm
+++ b/base/file_version_info_mac.mm
@@ -9,6 +9,7 @@
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 FileVersionInfo::FileVersionInfo(NSBundle *bundle) : bundle_(bundle) {
   [bundle_ retain];
@@ -43,15 +44,15 @@ FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
 }
 
 std::wstring FileVersionInfo::company_name() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::company_short_name() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::internal_name() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::product_name() {
@@ -63,7 +64,7 @@ std::wstring FileVersionInfo::product_short_name() {
 }
 
 std::wstring FileVersionInfo::comments() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::legal_copyright() {
@@ -75,22 +76,22 @@ std::wstring FileVersionInfo::product_version() {
 }
 
 std::wstring FileVersionInfo::file_description() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::legal_trademarks() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::private_build() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::file_version() {
   // CFBundleVersion has limitations that may not be honored by a
   // proper Chromium version number, so try KSVersion first.
   std::wstring version = GetStringValue(L"KSVersion");
-  if (version == L"")
+  if (version.empty())
     version = GetStringValue(L"CFBundleVersion");
   return version;
 }
@@ -100,7 +101,7 @@ std::wstring FileVersionInfo::original_filename() {
 }
 
 std::wstring FileVersionInfo::special_build() {
-  return L"";
+  return std::wstring();
 }
 
 std::wstring FileVersionInfo::last_change() {
@@ -132,5 +133,5 @@ std::wstring FileVersionInfo::GetStringValue(const wchar_t* name) {
   std::wstring str;
   if (GetValue(name, &str))
     return str;
-  return L"";
+  return std::wstring();
 }