Deprecate more old filepath functions.
These still exist on Windows due to being used by the installer,
but by moving them into the Windows-only block we prevent them
from being used in new code.
BUG=24672
Review URL: http://codereview.chromium.org/2861042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51453 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 8d19c7d3c2cced64a6e1dd22bc893cd5fe25eb2f
diff --git a/base/file_util_deprecated.h b/base/file_util_deprecated.h
index 6eae211..a5b7899 100644
--- a/base/file_util_deprecated.h
+++ b/base/file_util_deprecated.h
@@ -17,14 +17,6 @@
namespace file_util {
-// Use FilePath::DirName instead.
-void UpOneDirectory(std::wstring* dir);
-// Use FilePath::DirName instead.
-void UpOneDirectoryOrEmpty(std::wstring* dir);
-
-// Use FilePath::BaseName instead.
-std::wstring GetFilenameFromPath(const std::wstring& path);
-
// Use FilePath::Extension instead.
FilePath::StringType GetFileExtensionFromPath(const FilePath& path);
std::wstring GetFileExtensionFromPath(const std::wstring& path);
@@ -46,6 +38,14 @@
// Functions successfully deprecated on non-Windows, but Win-specific
// callers remain.
#if defined(OS_WIN)
+// Use FilePath::DirName instead.
+void UpOneDirectory(std::wstring* dir);
+// Use FilePath::DirName instead.
+void UpOneDirectoryOrEmpty(std::wstring* dir);
+
+// Use FilePath::BaseName instead.
+std::wstring GetFilenameFromPath(const std::wstring& path);
+
// Returns the directory component of a path, without the trailing
// path separator, or an empty string on error. The function does not
// check for the existence of the path, so if it is passed a directory
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 4827f59..fd54963 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -325,6 +325,8 @@
#endif
};
+#if defined(OS_WIN)
+// This function is deprecated on non-Windows.
TEST_F(FileUtilTest, GetFilenameFromPath) {
for (unsigned int i = 0; i < arraysize(filename_cases); ++i) {
const filename_case& value = filename_cases[i];
@@ -332,6 +334,7 @@
EXPECT_EQ(value.filename, result);
}
}
+#endif
// Test finding the file type from a path name
static const struct extension_case {