| Index: chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| index 38ccb97fc374fef280439e37c4dda19cfe160d07..bcbbc7c5f79dbb48b084a4aea04249754d65e57f 100644
|
| --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc
|
| @@ -346,19 +346,19 @@ void TestingAutomationProvider::GetBatteryInfo(DictionaryValue* args,
|
| scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
|
|
|
| return_value->SetBoolean("battery_is_present",
|
| - power_library->battery_is_present());
|
| - return_value->SetBoolean("line_power_on", power_library->line_power_on());
|
| - if (power_library->battery_is_present()) {
|
| + power_library->IsBatteryPresent());
|
| + return_value->SetBoolean("line_power_on", power_library->IsLinePowerOn());
|
| + if (power_library->IsBatteryPresent()) {
|
| return_value->SetBoolean("battery_fully_charged",
|
| - power_library->battery_fully_charged());
|
| + power_library->IsBatteryFullyCharged());
|
| return_value->SetDouble("battery_percentage",
|
| - power_library->battery_percentage());
|
| - if (power_library->line_power_on()) {
|
| - int time = power_library->battery_time_to_full().InSeconds();
|
| - if (time > 0 || power_library->battery_fully_charged())
|
| + power_library->GetBatteryPercentage());
|
| + if (power_library->IsLinePowerOn()) {
|
| + int time = power_library->GetBatteryTimeToFull().InSeconds();
|
| + if (time > 0 || power_library->IsBatteryFullyCharged())
|
| return_value->SetInteger("battery_time_to_full", time);
|
| } else {
|
| - int time = power_library->battery_time_to_empty().InSeconds();
|
| + int time = power_library->GetBatteryTimeToEmpty().InSeconds();
|
| if (time > 0)
|
| return_value->SetInteger("battery_time_to_empty", time);
|
| }
|
|
|