summaryrefslogtreecommitdiffstats
path: root/base/file_path.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 23:36:01 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-05 23:36:01 +0000
commit345e1b89c38bf19ebce483ae5392474bbf63ae59 (patch)
tree63f2e61cecbf1f28b876d21c3b8d6e4433220805 /base/file_path.cc
parent6ee68ee792e95e2460ac1f52162f6762944d5239 (diff)
downloadchromium_src-345e1b89c38bf19ebce483ae5392474bbf63ae59.zip
chromium_src-345e1b89c38bf19ebce483ae5392474bbf63ae59.tar.gz
chromium_src-345e1b89c38bf19ebce483ae5392474bbf63ae59.tar.bz2
Unbreak unit tests. Revert r7564.
tbr=jhawkins Review URL: http://codereview.chromium.org/16522 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_path.cc')
-rw-r--r--base/file_path.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/file_path.cc b/base/file_path.cc
index 45f6e327..49193152 100644
--- a/base/file_path.cc
+++ b/base/file_path.cc
@@ -113,7 +113,7 @@ FilePath FilePath::DirName() const {
return new_path;
}
-FilePath FilePath::BaseName() const {
+FilePath::StringType FilePath::BaseName() const {
FilePath new_path(path_);
new_path.StripTrailingSeparatorsInternal();
@@ -133,7 +133,7 @@ FilePath FilePath::BaseName() const {
new_path.path_.erase(0, last_separator + 1);
}
- return new_path;
+ return new_path.path_;
}
FilePath FilePath::Append(const FilePath::StringType& component) const {