diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:49:05 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 17:49:05 +0000 |
commit | 63597e4ebc117bb561b93f4d775d787120e6728a (patch) | |
tree | a4825625ef2ff06b339e56a30fa5ae80aea29160 /base/file_util_unittest.cc | |
parent | c48abb01ae7e295e283f190bd05270e835b8d37f (diff) | |
download | chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.zip chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.tar.gz chromium_src-63597e4ebc117bb561b93f4d775d787120e6728a.tar.bz2 |
Deprecate most of the remaining wstring file_util 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. (I am already finding new code using
some of these! I am glad to be rid of them.)
BUG=24672
Review URL: http://codereview.chromium.org/2850042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_unittest.cc')
-rw-r--r-- | base/file_util_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index fd54963..7acf00c 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -292,6 +292,8 @@ static const struct InsertBeforeExtensionCase { #endif }; +#if defined(OS_WIN) +// This function has been deprecated on non-Windows. TEST_F(FileUtilTest, InsertBeforeExtensionTest) { for (unsigned int i = 0; i < arraysize(kInsertBeforeExtension); ++i) { FilePath path(kInsertBeforeExtension[i].path); @@ -299,6 +301,7 @@ TEST_F(FileUtilTest, InsertBeforeExtensionTest) { EXPECT_EQ(kInsertBeforeExtension[i].result, path.value()); } } +#endif static const struct filename_case { const wchar_t* path; @@ -363,6 +366,8 @@ static const struct extension_case { #endif }; +#if defined(OS_WIN) +// This function has been deprecated on non-Windows. TEST_F(FileUtilTest, GetFileExtensionFromPath) { for (unsigned int i = 0; i < arraysize(extension_cases); ++i) { const extension_case& ext = extension_cases[i]; @@ -370,6 +375,7 @@ TEST_F(FileUtilTest, GetFileExtensionFromPath) { EXPECT_EQ(ext.extension, fext); } } +#endif // Test finding the directory component of a path static const struct dir_case { |