diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 22:14:22 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 22:14:22 +0000 |
| commit | 3f4b5713bc11f093edc946f2edccb1a2c41acd79 (patch) | |
| tree | de100c03a65af506391246aca6677fae6452aaec /base | |
| parent | 94832e5df61bf9b21706148fc4649a1ddd76f335 (diff) | |
| download | chromium_src-3f4b5713bc11f093edc946f2edccb1a2c41acd79.zip chromium_src-3f4b5713bc11f093edc946f2edccb1a2c41acd79.tar.gz chromium_src-3f4b5713bc11f093edc946f2edccb1a2c41acd79.tar.bz2 | |
Remove the deprecated version of ContentsEqual.
BUG=24672
TEST=base_unittests
Review URL: http://codereview.chromium.org/432001
Patch from tfarina.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/file_util.cc | 5 | ||||
| -rw-r--r-- | base/file_util.h | 3 | ||||
| -rw-r--r-- | base/file_util_unittest.cc | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/base/file_util.cc b/base/file_util.cc index a4bdb95..4f69e00 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -339,11 +339,6 @@ bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path, FilePath::FromWStringHack(to_path), recursive); } -bool ContentsEqual(const std::wstring& filename1, - const std::wstring& filename2) { - return ContentsEqual(FilePath::FromWStringHack(filename1), - FilePath::FromWStringHack(filename2)); -} bool CreateDirectory(const std::wstring& full_path) { return CreateDirectory(FilePath::FromWStringHack(full_path)); } diff --git a/base/file_util.h b/base/file_util.h index a6914b7..b91e6b7 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -183,9 +183,6 @@ bool GetFileCreationLocalTimeFromHandle(HANDLE file_handle, // otherwise. If either file can't be read, returns false. bool ContentsEqual(const FilePath& filename1, const FilePath& filename2); -// Deprecated temporary compatibility function. -bool ContentsEqual(const std::wstring& filename1, - const std::wstring& filename2); // Returns true if the contents of the two text files given are equal, false // otherwise. This routine treats "\r\n" and "\n" as equivalent. diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc index 7296113..0b47b231 100644 --- a/base/file_util_unittest.cc +++ b/base/file_util_unittest.cc @@ -874,7 +874,9 @@ TEST_F(ReadOnlyFileUtilTest, ContentsEqual) { EXPECT_TRUE(file_util::ContentsEqual(original_file, same_file)); EXPECT_FALSE(file_util::ContentsEqual(original_file, same_length_file)); EXPECT_FALSE(file_util::ContentsEqual(original_file, different_file)); - EXPECT_FALSE(file_util::ContentsEqual(L"bogusname", L"bogusname")); + EXPECT_FALSE(file_util::ContentsEqual( + FilePath(FILE_PATH_LITERAL("bogusname")), + FilePath(FILE_PATH_LITERAL("bogusname")))); EXPECT_FALSE(file_util::ContentsEqual(original_file, different_first_file)); EXPECT_FALSE(file_util::ContentsEqual(original_file, different_last_file)); EXPECT_TRUE(file_util::ContentsEqual(empty1_file, empty2_file)); |