summaryrefslogtreecommitdiffstats
path: root/base/file_util_posix.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 23:15:45 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 23:15:45 +0000
commita97f2b462ac8062e59849bfa2323d90f461fd5ff (patch)
tree5b3d08cc66629b98bd7270440a26b01217b66c0a /base/file_util_posix.cc
parent00d7e6289878922b937039cf542144a8c7906e8e (diff)
downloadchromium_src-a97f2b462ac8062e59849bfa2323d90f461fd5ff.zip
chromium_src-a97f2b462ac8062e59849bfa2323d90f461fd5ff.tar.gz
chromium_src-a97f2b462ac8062e59849bfa2323d90f461fd5ff.tar.bz2
Reverting 14152.
TBR=tony Review URL: http://codereview.chromium.org/87066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
-rw-r--r--base/file_util_posix.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 2e315ab..6a36c62 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -37,8 +37,9 @@ static const char* kTempFileName = "org.chromium.XXXXXX";
std::wstring GetDirectoryFromPath(const std::wstring& path) {
if (EndsWithSeparator(path)) {
- FilePath fp_path = FilePath::FromWStringHack(path);
- return fp_path.StripTrailingSeparators().ToWStringHack();
+ std::wstring dir = path;
+ TrimTrailingSeparator(&dir);
+ return dir;
} else {
char full_path[PATH_MAX];
base::strlcpy(full_path, WideToUTF8(path).c_str(), arraysize(full_path));