Keep trying to undo 7564.

base/file_util.cc

Index: base/file_util.cc
===================================================================
--- base/file_util.cc	(revision 7571)
+++ base/file_util.cc	(working copy)
@@ -381,11 +381,7 @@
   if (path.empty() || EndsWithSeparator(path))
     return std::wstring();
 
-#if defined(OS_WIN)
-  return FilePath::FromWStringHack(path).BaseName();
-#elif defined(OS_POSIX)
-  return UTF8ToWide(FilePath::FromWStringHack(path).BaseName());
-#endif
+  return FilePath::FromWStringHack(path).BaseName().ToWStringHack();
 }
 bool GetFileSize(const std::wstring& file_path, int64* file_size) {
   return GetFileSize(FilePath::FromWStringHack(file_path), file_size);