commit 506f091b990c8d57d15fd7f3449aa412f8f003e4
author thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Dec 02 07:14:22 2009 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 10:05:20 2020 +0900
tree afa845f8ce1c8e7c1132c358ac50ba3dc1774c81
parent 484d02625f279b1147e3ca3e6d78b6a92d35cee5

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


CrOS-Libchrome-Original-Commit: 3f4b5713bc11f093edc946f2edccb1a2c41acd79

base/file_util.cc

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 @@
                        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));
 }

base/file_util.h

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 @@
 // 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.

base/file_util_unittest.cc

diff --git a/base/file_util_unittest.cc b/base/file_util_unittest.cc
index 7296113..0b47b23 100644
--- a/base/file_util_unittest.cc
+++ b/base/file_util_unittest.cc
@@ -874,7 +874,9 @@
   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));