base: Stop overloading ReadFileToString()

With the existing code, base::Bind(&base::ReadFileToString) doesn't compile because
the compiler cannot infer the argument's type (2-argument version or
3-argument version).
base::Bind<bool(*)(const base::FilePath&,
std::string*)>(&base::ReadFileToString) compiles but it doesn't look
desirable.

As our style guide discourages function overloading(*), rename the 3-argument version (added in http://crrev.com/157593005) to stop overloading.

*https://google.github.io/styleguide/cppguide.html#Function_Overloading

BUG=None
TBR=sgurun@chromium.org for android_webview, derat@chromium.org for chromeos/accelerometer, bartfab@chromium.org for components/policy, dsinclair@chromium.org for components/tracing, estade@chromium.org for content/browser/webui, sergeyu@chromium.org for remoting

Review URL: https://codereview.chromium.org/1719983005

Cr-Commit-Position: refs/heads/master@{#377209}

3 files changed, 15 insertions, 14 deletions

diff --git a/base/files/file_util.cc b/base/files/file_util.cc
index 9e35b67..3169370 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)
diff --git a/base/files/file_util.h b/base/files/file_util.h
index dfc10a3..05b3cbf 100644
--- a/base/files/file_util.h
+++ b/base/files/file_util.h
@@ -154,9 +154,9 @@ BASE_EXPORT bool ReadFileToString(const FilePath& path, std::string* contents);
 // |max_size|.
 // |contents| may be NULL, in which case this function is useful for its side
 // effect of priming the disk cache (could be used for unit tests).
-BASE_EXPORT bool ReadFileToString(const FilePath& path,
-                                  std::string* contents,
-                                  size_t max_size);
+BASE_EXPORT bool ReadFileToStringWithMaxSize(const FilePath& path,
+                                             std::string* contents,
+                                             size_t max_size);
 
 #if defined(OS_POSIX)
 
diff --git a/base/files/file_util_unittest.cc b/base/files/file_util_unittest.cc
index 61ccba4..a0d0a28 100644
--- a/base/files/file_util_unittest.cc
+++ b/base/files/file_util_unittest.cc
@@ -2066,26 +2066,26 @@ TEST_F(FileUtilTest, ReadFileToString) {
   EXPECT_EQ(kTestData, data);
 
   data = "temp";
-  EXPECT_FALSE(ReadFileToString(file_path, &data, 0));
+  EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, &data, 0));
   EXPECT_EQ(0u, data.length());
 
   data = "temp";
-  EXPECT_FALSE(ReadFileToString(file_path, &data, 2));
+  EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, &data, 2));
   EXPECT_EQ("01", data);
 
   data.clear();
-  EXPECT_FALSE(ReadFileToString(file_path, &data, 3));
+  EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, &data, 3));
   EXPECT_EQ("012", data);
 
   data.clear();
-  EXPECT_TRUE(ReadFileToString(file_path, &data, 4));
+  EXPECT_TRUE(ReadFileToStringWithMaxSize(file_path, &data, 4));
   EXPECT_EQ("0123", data);
 
   data.clear();
-  EXPECT_TRUE(ReadFileToString(file_path, &data, 6));
+  EXPECT_TRUE(ReadFileToStringWithMaxSize(file_path, &data, 6));
   EXPECT_EQ("0123", data);
 
-  EXPECT_TRUE(ReadFileToString(file_path, NULL, 6));
+  EXPECT_TRUE(ReadFileToStringWithMaxSize(file_path, NULL, 6));
 
   EXPECT_TRUE(ReadFileToString(file_path, NULL));
 
@@ -2101,7 +2101,7 @@ TEST_F(FileUtilTest, ReadFileToString) {
   EXPECT_EQ(0u, data.length());
 
   data = "temp";
-  EXPECT_FALSE(ReadFileToString(file_path, &data, 6));
+  EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, &data, 6));
   EXPECT_EQ(0u, data.length());
 }