From 2c8088a4452c2c204237ba9f2f3706e7eeaaf35b Mon Sep 17 00:00:00 2001 From: "tkent@chromium.org" Date: Thu, 15 Oct 2009 05:00:25 +0000 Subject: Remove file_util::TrimTrailingSeparators(), which is deprecated and doesn't work well for Windows root drives. BUG=24722 TEST=existing tests are enough. Review URL: http://codereview.chromium.org/271086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29093 0039d316-1c4b-4281-b951-d872f2087c98 --- base/file_util_win.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'base/file_util_win.cc') diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 2d4a694..d6edc6f 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -28,8 +28,7 @@ std::wstring GetDirectoryFromPath(const std::wstring& path) { std::wstring::size_type length = file_ptr ? file_ptr - path_buffer : path.length(); std::wstring directory(path, 0, length); - TrimTrailingSeparator(&directory); - return directory; + return FilePath(directory).StripTrailingSeparators().value(); } bool AbsolutePath(FilePath* path) { @@ -651,8 +650,7 @@ bool GetCurrentDirectory(FilePath* dir) { // trailing slash. We duplicate this here, but it shouldn't be necessary // when everyone is using the appropriate FilePath APIs. std::wstring dir_str(system_buffer); - file_util::TrimTrailingSeparator(&dir_str); - *dir = FilePath(dir_str); + *dir = FilePath(dir_str).StripTrailingSeparators(); return true; } -- cgit v1.1