diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 05:09:50 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 05:09:50 +0000 |
commit | 66ff7356a381d6c8c6c3272b095938408c4f3188 (patch) | |
tree | 9c3ae2fb0d55d1d9650a8071d1c80c557e7f0d93 /base/file_util.cc | |
parent | 2c8088a4452c2c204237ba9f2f3706e7eeaaf35b (diff) | |
download | chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.zip chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.tar.gz chromium_src-66ff7356a381d6c8c6c3272b095938408c4f3188.tar.bz2 |
Re-try r29078: Remove some deprecated file_util wstring functions.
With the previous patch, the try bots failed with mysterious messages, so I ignored them, patched it into my windows box and tested it there manually, and found no problems. As it turns out, the try failures were real :(. But nsylvain and I found the problem: the behavior of file_util::GetDirectoryFromPath() differs from DirName() when the path is empty (officially, GetDirectoryFromPath is not supposed to support non-absolute paths, but that is not enforced).
Here is a green win try result: http://build.chromium.org/buildbot/try-server/builders/win/builds/3705
mac: http://build.chromium.org/buildbot/try-server/builders/mac/builds/3491
linux: http://build.chromium.org/buildbot/try-server/builders/linux/builds/3466
I also applied this patch locally in Windows to test that it doesn't break the chrome frame compile or tests, since that's not covered by the trybots yet.
Review URL: http://codereview.chromium.org/271099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util.cc')
-rw-r--r-- | base/file_util.cc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/base/file_util.cc b/base/file_util.cc index 9976d88..4cde773 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -317,10 +317,6 @@ bool ContentsEqual(const std::wstring& filename1, return ContentsEqual(FilePath::FromWStringHack(filename1), FilePath::FromWStringHack(filename2)); } -bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) { - return CopyFile(FilePath::FromWStringHack(from_path), - FilePath::FromWStringHack(to_path)); -} bool CreateDirectory(const std::wstring& full_path) { return CreateDirectory(FilePath::FromWStringHack(full_path)); } @@ -340,9 +336,6 @@ bool CreateNewTempDirectory(const std::wstring& prefix, bool Delete(const std::wstring& path, bool recursive) { return Delete(FilePath::FromWStringHack(path), recursive); } -bool DirectoryExists(const std::wstring& path) { - return DirectoryExists(FilePath::FromWStringHack(path)); -} bool EndsWithSeparator(std::wstring* path) { return EndsWithSeparator(FilePath::FromWStringHack(*path)); } @@ -384,16 +377,9 @@ bool GetTempDir(std::wstring* path_str) { *path_str = path.ToWStringHack(); return true; } -bool Move(const std::wstring& from_path, const std::wstring& to_path) { - return Move(FilePath::FromWStringHack(from_path), - FilePath::FromWStringHack(to_path)); -} FILE* OpenFile(const std::wstring& filename, const char* mode) { return OpenFile(FilePath::FromWStringHack(filename), mode); } -bool PathExists(const std::wstring& path) { - return PathExists(FilePath::FromWStringHack(path)); -} int ReadFile(const std::wstring& filename, char* data, int size) { return ReadFile(FilePath::FromWStringHack(filename), data, size); } |