power: Update to build against libchrome-271506.
BUG=chromium:375032
TEST=`FEATURES=test emerge-$BOARD platform2`
Change-Id: I63ebbcd347b930ea557806cf07cf026be2e76de9
Reviewed-on: https://chromium-review.googlesource.com/201052
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/common/prefs.cc b/common/prefs.cc
index f11224b..998eeba 100644
--- a/common/prefs.cc
+++ b/common/prefs.cc
@@ -109,7 +109,7 @@
else if (!base::ReadFileToString(path, &buf))
continue;
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
PrefReadResult result;
result.path = path.value();
result.value = buf;
@@ -200,7 +200,7 @@
const std::string& name = it->first;
const std::string& value = it->second;
base::FilePath path = pref_paths_[0].Append(name);
- if (file_util::WriteFile(path, value.data(), value.size()) == -1)
+ if (base::WriteFile(path, value.data(), value.size()) == -1)
PLOG(ERROR) << "Failed to write " << path.AsUTF8Unsafe();
}
prefs_to_write_.clear();
diff --git a/common/prefs_unittest.cc b/common/prefs_unittest.cc
index 9a402db..ea44b2a 100644
--- a/common/prefs_unittest.cc
+++ b/common/prefs_unittest.cc
@@ -192,13 +192,13 @@
// This way, each path's pref file will have a unique value.
std::string int_string = base::Int64ToString(kIntTestValue + i);
EXPECT_EQ(int_string.size(),
- file_util::WriteFile(path.Append(kIntTestFileName),
+ base::WriteFile(path.Append(kIntTestFileName),
int_string.data(), int_string.size()));
EXPECT_TRUE(base::PathExists(path.Append(kIntTestFileName)));
std::string double_string = base::DoubleToString(kDoubleTestValue + i);
EXPECT_EQ(double_string.size(),
- file_util::WriteFile(path.Append(kDoubleTestFileName),
+ base::WriteFile(path.Append(kDoubleTestFileName),
double_string.data(), double_string.size()));
EXPECT_TRUE(base::PathExists(path.Append(kDoubleTestFileName)));
}
@@ -254,11 +254,11 @@
double_string = base::DoubleToString(kDoubleTestValue);
}
EXPECT_EQ(int_string.size(),
- file_util::WriteFile(path.Append(kIntTestFileName),
+ base::WriteFile(path.Append(kIntTestFileName),
int_string.data(), int_string.size()));
EXPECT_TRUE(base::PathExists(path.Append(kIntTestFileName)));
EXPECT_EQ(double_string.size(),
- file_util::WriteFile(path.Append(kDoubleTestFileName),
+ base::WriteFile(path.Append(kDoubleTestFileName),
double_string.data(), double_string.size()));
EXPECT_TRUE(base::PathExists(path.Append(kDoubleTestFileName)));
}
@@ -281,12 +281,12 @@
TestPrefsObserver observer(&prefs_);
ASSERT_TRUE(prefs_.Init(paths_));
EXPECT_EQ(strlen(kPrefValue),
- file_util::WriteFile(kFilePath, kPrefValue, strlen(kPrefValue)));
+ base::WriteFile(kFilePath, kPrefValue, strlen(kPrefValue)));
EXPECT_EQ(kPrefName, observer.RunUntilPrefChanged());
// Write to the file again.
EXPECT_EQ(strlen(kPrefValue),
- file_util::WriteFile(kFilePath, kPrefValue, strlen(kPrefValue)));
+ base::WriteFile(kFilePath, kPrefValue, strlen(kPrefValue)));
EXPECT_EQ(kPrefName, observer.RunUntilPrefChanged());
// Remove the file.
diff --git a/common/testrunner.cc b/common/testrunner.cc
index 1f9aaae..7baba5d 100644
--- a/common/testrunner.cc
+++ b/common/testrunner.cc
@@ -13,8 +13,6 @@
CommandLine::Init(argc, argv);
logging::LoggingSettings settings;
settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
- settings.dcheck_state =
- logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS;
logging::InitLogging(settings);
base::AtExitManager at_exit_manager;
base::MessageLoopForIO message_loop;
diff --git a/powerd/daemon.cc b/powerd/daemon.cc
index 245bfb2..ae0f500 100644
--- a/powerd/daemon.cc
+++ b/powerd/daemon.cc
@@ -354,7 +354,7 @@
base::FilePath path(kWakeupCountPath);
std::string buf;
if (base::ReadFileToString(path, &buf)) {
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
if (base::StringToUint64(buf, wakeup_count))
return true;
@@ -367,7 +367,7 @@
virtual void SetSuspendAnnounced(bool announced) OVERRIDE {
if (announced) {
- if (file_util::WriteFile(daemon_->suspend_announced_path_, NULL, 0) < 0) {
+ if (base::WriteFile(daemon_->suspend_announced_path_, NULL, 0) < 0) {
PLOG(ERROR) << "Couldn't create "
<< daemon_->suspend_announced_path_.value();
}
@@ -657,7 +657,7 @@
created_suspended_state_file_ = false;
const base::FilePath kStatePath(kSuspendedStatePath);
if (!base::PathExists(kStatePath)) {
- if (file_util::WriteFile(kStatePath, NULL, 0) == 0)
+ if (base::WriteFile(kStatePath, NULL, 0) == 0)
created_suspended_state_file_ = true;
else
LOG(WARNING) << "Unable to create " << kSuspendedStatePath;
diff --git a/powerd/policy/dark_resume_policy.cc b/powerd/policy/dark_resume_policy.cc
index c5cdf78..3b4f80f 100644
--- a/powerd/policy/dark_resume_policy.cc
+++ b/powerd/policy/dark_resume_policy.cc
@@ -113,7 +113,7 @@
PLOG(ERROR) << "Unable to read " << kDarkResumeStatePath;
return false;
}
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
uint64 value = 0;
return base::StringToUint64(buf, &value) && value;
}
@@ -224,7 +224,7 @@
const std::string& state) {
for (std::vector<base::FilePath>::const_iterator iter = files.begin();
iter != files.end(); ++iter) {
- file_util::WriteFile(*iter, state.c_str(), state.length());
+ base::WriteFile(*iter, state.c_str(), state.length());
}
}
diff --git a/powerd/policy/dark_resume_policy_unittest.cc b/powerd/policy/dark_resume_policy_unittest.cc
index f2f26f5..2bdef5c 100644
--- a/powerd/policy/dark_resume_policy_unittest.cc
+++ b/powerd/policy/dark_resume_policy_unittest.cc
@@ -86,8 +86,8 @@
for (map<string, string>::iterator iter = values.begin();
iter != values.end();
++iter) {
- file_util::WriteFile(path_.Append(iter->first),
- iter->second.c_str(), iter->second.length());
+ base::WriteFile(path_.Append(iter->first),
+ iter->second.c_str(), iter->second.length());
}
ASSERT_TRUE(power_supply_->RefreshImmediately());
diff --git a/powerd/system/ambient_light_sensor.cc b/powerd/system/ambient_light_sensor.cc
index cae8028..65da1c3 100644
--- a/powerd/system/ambient_light_sensor.cc
+++ b/powerd/system/ambient_light_sensor.cc
@@ -88,7 +88,7 @@
void AmbientLightSensor::ReadCallback(const std::string& data) {
std::string trimmed_data;
- TrimWhitespaceASCII(data, TRIM_ALL, &trimmed_data);
+ base::TrimWhitespaceASCII(data, base::TRIM_ALL, &trimmed_data);
int value = 0;
if (base::StringToInt(trimmed_data, &value)) {
lux_value_ = value;
diff --git a/powerd/system/ambient_light_sensor_unittest.cc b/powerd/system/ambient_light_sensor_unittest.cc
index 1d10f47..ab85c4c 100644
--- a/powerd/system/ambient_light_sensor_unittest.cc
+++ b/powerd/system/ambient_light_sensor_unittest.cc
@@ -81,7 +81,7 @@
void WriteLux(int lux) {
std::string lux_string = base::IntToString(lux);
int bytes_written =
- file_util::WriteFile(data_file_, lux_string.data(), lux_string.size());
+ base::WriteFile(data_file_, lux_string.data(), lux_string.size());
CHECK(bytes_written == static_cast<int>(lux_string.size()))
<< "Wrote " << bytes_written << " byte(s) instead of "
<< lux_string.size() << " to " << data_file_.value();
diff --git a/powerd/system/async_file_reader_unittest.cc b/powerd/system/async_file_reader_unittest.cc
index 38669a0..30a7d76 100644
--- a/powerd/system/async_file_reader_unittest.cc
+++ b/powerd/system/async_file_reader_unittest.cc
@@ -43,7 +43,7 @@
// Write the contents to file and make sure the right size was written.
EXPECT_EQ(total_size,
- file_util::WriteFile(path, file_contents.data(), total_size));
+ base::WriteFile(path, file_contents.data(), total_size));
}
// When testing a file read where |file size| > |initial read size|, this is the
diff --git a/powerd/system/display/display_watcher.cc b/powerd/system/display/display_watcher.cc
index 233180c..14ac06e 100644
--- a/powerd/system/display/display_watcher.cc
+++ b/powerd/system/display/display_watcher.cc
@@ -39,7 +39,7 @@
return false;
// Trim whitespace to deal with trailing newlines.
- TrimWhitespaceASCII(status, TRIM_TRAILING, &status);
+ base::TrimWhitespaceASCII(status, base::TRIM_TRAILING, &status);
return status == DisplayWatcher::kDrmStatusConnected;
}
diff --git a/powerd/system/display/display_watcher_unittest.cc b/powerd/system/display/display_watcher_unittest.cc
index f321b29..dac6685 100644
--- a/powerd/system/display/display_watcher_unittest.cc
+++ b/powerd/system/display/display_watcher_unittest.cc
@@ -67,7 +67,7 @@
// the file.
base::FilePath CreateI2CDevice(const std::string& device_name) {
base::FilePath device_path = device_dir_.path().Append(device_name);
- CHECK_EQ(file_util::WriteFile(device_path, "\n", 1), 1);
+ CHECK_EQ(base::WriteFile(device_path, "\n", 1), 1);
return device_path;
}
@@ -101,14 +101,14 @@
const char kDisconnected[] = "disconnected";
base::FilePath status_path =
device_path.Append(DisplayWatcher::kDrmStatusFile);
- ASSERT_TRUE(file_util::WriteFile(status_path, kDisconnected,
+ ASSERT_TRUE(base::WriteFile(status_path, kDisconnected,
strlen(kDisconnected)));
NotifyAboutUdevEvent();
EXPECT_EQ(static_cast<size_t>(0), watcher_.GetDisplays().size());
// The display should be reported when the device's status goes to
// "connected".
- ASSERT_TRUE(file_util::WriteFile(status_path,
+ ASSERT_TRUE(base::WriteFile(status_path,
DisplayWatcher::kDrmStatusConnected,
strlen(DisplayWatcher::kDrmStatusConnected)));
NotifyAboutUdevEvent();
@@ -117,7 +117,7 @@
// A trailing newline should be okay.
std::string kConnectedNewline(DisplayWatcher::kDrmStatusConnected);
kConnectedNewline += "\n";
- ASSERT_TRUE(file_util::WriteFile(status_path, kConnectedNewline.c_str(),
+ ASSERT_TRUE(base::WriteFile(status_path, kConnectedNewline.c_str(),
kConnectedNewline.size()));
NotifyAboutUdevEvent();
ASSERT_EQ(static_cast<size_t>(1), watcher_.GetDisplays().size());
@@ -128,7 +128,7 @@
base::FilePath second_device_path = CreateDrmDevice("card0-DP-0");
base::FilePath second_status_path =
second_device_path.Append(DisplayWatcher::kDrmStatusFile);
- ASSERT_TRUE(file_util::WriteFile(second_status_path, kDisconnected,
+ ASSERT_TRUE(base::WriteFile(second_status_path, kDisconnected,
strlen(kDisconnected)));
NotifyAboutUdevEvent();
ASSERT_EQ(static_cast<size_t>(1), watcher_.GetDisplays().size());
@@ -137,7 +137,7 @@
// Connect the second device. It should be reported first since devices are
// sorted alphabetically.
- ASSERT_TRUE(file_util::WriteFile(second_status_path,
+ ASSERT_TRUE(base::WriteFile(second_status_path,
DisplayWatcher::kDrmStatusConnected,
strlen(DisplayWatcher::kDrmStatusConnected)));
NotifyAboutUdevEvent();
@@ -150,14 +150,14 @@
// Disconnect both devices and create a new device that has a
// "connected" status but doesn't match the expected naming pattern for a
// video card.
- ASSERT_TRUE(file_util::WriteFile(status_path, kDisconnected,
+ ASSERT_TRUE(base::WriteFile(status_path, kDisconnected,
strlen(kDisconnected)));
- ASSERT_TRUE(file_util::WriteFile(second_status_path, kDisconnected,
+ ASSERT_TRUE(base::WriteFile(second_status_path, kDisconnected,
strlen(kDisconnected)));
base::FilePath misnamed_device_path = CreateDrmDevice("control32");
base::FilePath misnamed_status_path =
misnamed_device_path.Append(DisplayWatcher::kDrmStatusFile);
- ASSERT_TRUE(file_util::WriteFile(misnamed_status_path,
+ ASSERT_TRUE(base::WriteFile(misnamed_status_path,
kConnectedNewline.c_str(), kConnectedNewline.size()));
NotifyAboutUdevEvent();
EXPECT_EQ(static_cast<size_t>(0), watcher_.GetDisplays().size());
@@ -168,7 +168,7 @@
base::FilePath device_path = CreateDrmDevice("card0-DP-1");
base::FilePath status_path =
device_path.Append(DisplayWatcher::kDrmStatusFile);
- ASSERT_TRUE(file_util::WriteFile(status_path,
+ ASSERT_TRUE(base::WriteFile(status_path,
DisplayWatcher::kDrmStatusConnected,
strlen(DisplayWatcher::kDrmStatusConnected)));
@@ -219,7 +219,7 @@
base::FilePath device_path = CreateDrmDevice("card0-DP-1");
base::FilePath status_path =
device_path.Append(DisplayWatcher::kDrmStatusFile);
- ASSERT_TRUE(file_util::WriteFile(status_path,
+ ASSERT_TRUE(base::WriteFile(status_path,
DisplayWatcher::kDrmStatusConnected,
strlen(DisplayWatcher::kDrmStatusConnected)));
NotifyAboutUdevEvent();
diff --git a/powerd/system/input.cc b/powerd/system/input.cc
index 25aa895..c508bd2 100644
--- a/powerd/system/input.cc
+++ b/powerd/system/input.cc
@@ -380,7 +380,7 @@
base::FilePath path = base::FilePath(kSysClassInputPath).
Append(name).Append("device/power/wakeup");
const char* state = enabled ? kWakeupEnabled : kWakeupDisabled;
- if (!file_util::WriteFile(path, state, strlen(state))) {
+ if (!base::WriteFile(path, state, strlen(state))) {
LOG(ERROR) << "Failed to write to " << path.value();
return false;
}
@@ -469,7 +469,7 @@
<< device_name_path.value();
return false;
}
- TrimWhitespaceASCII(input_name, TRIM_TRAILING, &input_name);
+ base::TrimWhitespaceASCII(input_name, base::TRIM_TRAILING, &input_name);
WakeupMap::iterator iter = wakeup_inputs_map_.find(input_name);
if (iter == wakeup_inputs_map_.end()) {
// Not on the list of wakeup input devices
diff --git a/powerd/system/internal_backlight.cc b/powerd/system/internal_backlight.cc
index fdefb33..3b3bfa9 100644
--- a/powerd/system/internal_backlight.cc
+++ b/powerd/system/internal_backlight.cc
@@ -32,7 +32,7 @@
return false;
}
- TrimWhitespaceASCII(level_str, TRIM_TRAILING, &level_str);
+ base::TrimWhitespaceASCII(level_str, base::TRIM_TRAILING, &level_str);
if (!base::StringToInt64(level_str, level)) {
LOG(ERROR) << "Unable to parse brightness \"" << level_str << "\" from "
<< path.value();
@@ -45,7 +45,7 @@
// Writes |level| to |path|. Returns false on failure.
bool WriteBrightnessLevelToFile(const base::FilePath& path, int64 level) {
std::string buf = base::Int64ToString(level);
- if (file_util::WriteFile(path, buf.data(), buf.size()) == -1) {
+ if (base::WriteFile(path, buf.data(), buf.size()) == -1) {
LOG(ERROR) << "Unable to write brightness \"" << buf << "\" to "
<< path.value();
return false;
diff --git a/powerd/system/internal_backlight_unittest.cc b/powerd/system/internal_backlight_unittest.cc
index b326e5f..60bf5bd 100644
--- a/powerd/system/internal_backlight_unittest.cc
+++ b/powerd/system/internal_backlight_unittest.cc
@@ -37,20 +37,20 @@
std::string str = base::StringPrintf("%" PRId64 "\n", brightness);
ASSERT_EQ(str.size(),
- file_util::WriteFile(
+ base::WriteFile(
path.Append(InternalBacklight::kBrightnessFilename),
str.data(), str.size()));
str = base::StringPrintf("%" PRId64 "\n", max_brightness);
ASSERT_EQ(str.size(),
- file_util::WriteFile(
+ base::WriteFile(
path.Append(InternalBacklight::kMaxBrightnessFilename),
str.data(), str.size()));
if (actual_brightness >= 0) {
str = base::StringPrintf("%" PRId64 "\n", actual_brightness);
ASSERT_EQ(str.size(),
- file_util::WriteFile(
+ base::WriteFile(
path.Append(InternalBacklight::kActualBrightnessFilename),
str.data(), str.size()));
}
@@ -67,7 +67,7 @@
return -1;
}
int64 level = 0;
- TrimWhitespaceASCII(data, TRIM_TRAILING, &data);
+ base::TrimWhitespaceASCII(data, base::TRIM_TRAILING, &data);
if (!base::StringToInt64(data, &level)) {
LOG(ERROR) << "Unable to parse \"" << level << "\" from " << file.value();
return -1;
diff --git a/powerd/system/peripheral_battery_watcher.cc b/powerd/system/peripheral_battery_watcher.cc
index 1d61db6..217568c 100644
--- a/powerd/system/peripheral_battery_watcher.cc
+++ b/powerd/system/peripheral_battery_watcher.cc
@@ -66,7 +66,7 @@
std::string buf;
base::ReadFileToString(scope_path, &buf);
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
if (buf != "Device")
continue;
@@ -94,7 +94,7 @@
std::string model_name;
base::ReadFileToString(model_name_path, &model_name);
- TrimWhitespaceASCII(model_name, TRIM_TRAILING, &model_name);
+ base::TrimWhitespaceASCII(model_name, base::TRIM_TRAILING, &model_name);
AsyncFileReader* reader = new AsyncFileReader;
battery_readers_.push_back(reader);
@@ -132,7 +132,7 @@
const std::string& model_name,
const std::string& data) {
std::string trimmed_data;
- TrimWhitespaceASCII(data, TRIM_ALL, &trimmed_data);
+ base::TrimWhitespaceASCII(data, base::TRIM_ALL, &trimmed_data);
int level = -1;
if (base::StringToInt(trimmed_data, &level)) {
SendBatteryStatus(path, model_name, level);
diff --git a/powerd/system/peripheral_battery_watcher_unittest.cc b/powerd/system/peripheral_battery_watcher_unittest.cc
index 8aa974a..1c54a17 100644
--- a/powerd/system/peripheral_battery_watcher_unittest.cc
+++ b/powerd/system/peripheral_battery_watcher_unittest.cc
@@ -84,7 +84,7 @@
protected:
void WriteFile(const base::FilePath& path, const string& str) {
- ASSERT_EQ(str.size(), file_util::WriteFile(path, str.data(), str.size()));
+ ASSERT_EQ(str.size(), base::WriteFile(path, str.data(), str.size()));
}
// Temporary directory mimicking a /sys directory containing a set of sensor
diff --git a/powerd/system/power_supply.cc b/powerd/system/power_supply.cc
index 5f1dc51..4fefbd0 100644
--- a/powerd/system/power_supply.cc
+++ b/powerd/system/power_supply.cc
@@ -64,7 +64,7 @@
if (!base::ReadFileToString(directory.Append(filename), out))
return false;
- TrimWhitespaceASCII(*out, TRIM_TRAILING, out);
+ base::TrimWhitespaceASCII(*out, base::TRIM_TRAILING, out);
return true;
}
@@ -497,7 +497,7 @@
if (base::PathExists(scope_path)) {
std::string buf;
base::ReadFileToString(scope_path, &buf);
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
if (buf == "Device") {
VLOG(1) << "Skipping Power supply " << path.value()
<< " with scope: " << buf;
@@ -506,7 +506,7 @@
}
std::string buf;
if (base::ReadFileToString(path.Append("type"), &buf)) {
- TrimWhitespaceASCII(buf, TRIM_TRAILING, &buf);
+ base::TrimWhitespaceASCII(buf, base::TRIM_TRAILING, &buf);
// Only look for battery / line power paths if they haven't been found
// already. This makes the assumption that they don't change (but battery
// path can disappear if removed). So this code should only be run once
diff --git a/powerd/system/power_supply_unittest.cc b/powerd/system/power_supply_unittest.cc
index 96f3310..2b0f658 100644
--- a/powerd/system/power_supply_unittest.cc
+++ b/powerd/system/power_supply_unittest.cc
@@ -144,8 +144,8 @@
void WriteValue(const std::string& relative_filename,
const std::string& value) {
- CHECK(file_util::WriteFile(path_.Append(relative_filename),
- value.c_str(), value.length()));
+ CHECK(base::WriteFile(path_.Append(relative_filename),
+ value.c_str(), value.length()));
}
void WriteDoubleValue(const std::string& relative_filename, double value) {
diff --git a/tools/powerd_dbus_suspend.cc b/tools/powerd_dbus_suspend.cc
index 9ee9366..65d5553 100644
--- a/tools/powerd_dbus_suspend.cc
+++ b/tools/powerd_dbus_suspend.cc
@@ -80,9 +80,9 @@
if (FLAGS_wakeup_timeout) {
std::string alarm_string =
base::IntToString(time(NULL) + FLAGS_wakeup_timeout);
- CHECK(file_util::WriteFile(base::FilePath(kRtcWakeAlarmPath),
- alarm_string.c_str(),
- alarm_string.length()));
+ CHECK(base::WriteFile(base::FilePath(kRtcWakeAlarmPath),
+ alarm_string.c_str(),
+ alarm_string.length()));
}
powerd_proxy->ConnectToSignal(
