summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 03:37:06 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 03:37:06 +0000
commitf43d11d73b66b5ddd4da371259accce2d8341688 (patch)
tree56d432ddd5b76494bff2482cbe6e0a645b14518e /base
parentdb108ddfbd5a856ed095cbef788c8c4f4628e607 (diff)
downloadchromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.zip
chromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.tar.gz
chromium_src-f43d11d73b66b5ddd4da371259accce2d8341688.tar.bz2
file_util: Get rid of the deprecated UpOneDirectory function.
This removes the latest usage of this function. BUG=24672 TEST=mini_installer_test Review URL: http://codereview.chromium.org/2946007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util.cc8
-rw-r--r--base/file_util_deprecated.h3
2 files changed, 0 insertions, 11 deletions
diff --git a/base/file_util.cc b/base/file_util.cc
index b611716..1689d5b 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -394,14 +394,6 @@ FILE* OpenFile(const std::wstring& filename, const char* mode) {
int ReadFile(const std::wstring& filename, char* data, int size) {
return ReadFile(FilePath::FromWStringHack(filename), data, size);
}
-void UpOneDirectory(std::wstring* dir) {
- FilePath path = FilePath::FromWStringHack(*dir);
- FilePath directory = path.DirName();
- // If there is no separator, we will get back kCurrentDirectory.
- // In this case don't change |dir|.
- if (directory.value() != FilePath::kCurrentDirectory)
- *dir = directory.ToWStringHack();
-}
int WriteFile(const std::wstring& filename, const char* data, int size) {
return WriteFile(FilePath::FromWStringHack(filename), data, size);
}
diff --git a/base/file_util_deprecated.h b/base/file_util_deprecated.h
index efffe8f..d02ad85 100644
--- a/base/file_util_deprecated.h
+++ b/base/file_util_deprecated.h
@@ -26,9 +26,6 @@ namespace file_util {
FILE* OpenFile(const std::string& filename, const char* mode);
FILE* OpenFile(const std::wstring& filename, const char* mode);
-// Use FilePath::DirName instead.
-void UpOneDirectory(std::wstring* dir);
-
// Use FilePath::BaseName instead.
std::wstring GetFilenameFromPath(const std::wstring& path);