Keep trying to undo 7564.

base/file_util.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 "base/file_util.h"
 
 #include <stdio.h>
 
 #include <fstream>
 
@@ skipping 363 matching lines @@
   *path_str = path.ToWStringHack();
   return true;
 }
 bool GetFileInfo(const std::wstring& file_path, FileInfo* results) {
   return GetFileInfo(FilePath::FromWStringHack(file_path), results);
 }
 std::wstring GetFilenameFromPath(const std::wstring& path) {
   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);
 }
 bool GetTempDir(std::wstring* path_str) {
   FilePath path;
   if (!GetTempDir(&path))
     return false;
   *path_str = path.ToWStringHack();
   return true;
@@ skipping 34 matching lines @@
   FilePath directory = path.DirName();
   // If there is no separator, we will get back kCurrentDirectory.
   // In this case, clear dir.
   if (directory == path || directory.value() == FilePath::kCurrentDirectory)
     dir->clear();
   else
     *dir = directory.ToWStringHack();
 }
 }  // namespace