Index: base/files/file_util.cc |
diff --git a/base/files/file_util.cc b/base/files/file_util.cc |
index 9e35b671db8021ceda7b471a4024f6087c076555..31693704d6761e414ecc34b33809a15e03b21b1c 100644 |
--- a/base/files/file_util.cc |
+++ b/base/files/file_util.cc |
@@ -124,9 +124,9 @@ bool TextContentsEqual(const FilePath& filename1, const FilePath& filename2) { |
} |
#endif // !defined(OS_NACL_NONSFI) |
-bool ReadFileToString(const FilePath& path, |
- std::string* contents, |
- size_t max_size) { |
+bool ReadFileToStringWithMaxSize(const FilePath& path, |
+ std::string* contents, |
+ size_t max_size) { |
if (contents) |
contents->clear(); |
if (path.ReferencesParent()) |
@@ -162,7 +162,8 @@ bool ReadFileToString(const FilePath& path, |
} |
bool ReadFileToString(const FilePath& path, std::string* contents) { |
- return ReadFileToString(path, contents, std::numeric_limits<size_t>::max()); |
+ return ReadFileToStringWithMaxSize(path, contents, |
+ std::numeric_limits<size_t>::max()); |
} |
#if !defined(OS_NACL_NONSFI) |