summaryrefslogtreecommitdiffstats
path: root/chromeos/accelerometer
diff options
context:
space:
mode:
authorhashimoto <hashimoto@chromium.org>2016-02-23 19:39:58 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-24 03:41:18 +0000
commit6da2fef05a6d503710e5f9b6f1363d94eac7c633 (patch)
tree0555ad23af0411705c52f2d218e75c20779548f5 /chromeos/accelerometer
parentad0d07421f17d5d822994cf906412f0d9788d500 (diff)
downloadchromium_src-6da2fef05a6d503710e5f9b6f1363d94eac7c633.zip
chromium_src-6da2fef05a6d503710e5f9b6f1363d94eac7c633.tar.gz
chromium_src-6da2fef05a6d503710e5f9b6f1363d94eac7c633.tar.bz2
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}
Diffstat (limited to 'chromeos/accelerometer')
-rw-r--r--chromeos/accelerometer/accelerometer_reader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/accelerometer/accelerometer_reader.cc b/chromeos/accelerometer/accelerometer_reader.cc
index bf96443..4cc0bfd 100644
--- a/chromeos/accelerometer/accelerometer_reader.cc
+++ b/chromeos/accelerometer/accelerometer_reader.cc
@@ -91,7 +91,7 @@ const int kSizeOfReading = kDataSize * kNumberOfAxes;
bool ReadFileToInt(const base::FilePath& path, int* value) {
std::string s;
DCHECK(value);
- if (!base::ReadFileToString(path, &s, kMaxAsciiUintLength)) {
+ if (!base::ReadFileToStringWithMaxSize(path, &s, kMaxAsciiUintLength)) {
return false;
}
base::TrimWhitespaceASCII(s, base::TRIM_ALL, &s);