chromeos: Simplify power supply info in PowerLibrary

chrome/browser/chromeos/status/power_menu_button.cc

Index: chrome/browser/chromeos/status/power_menu_button.cc
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index 43a4060cd130b91fc1fdddc06b9fb8146c09b52a..025a69e62818df936deb8f38f8ea991f98439608 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "third_party/cros/chromeos_power.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -350,7 +351,8 @@ void PowerMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
 ////////////////////////////////////////////////////////////////////////////////
 // PowerMenuButton, PowerLibrary::Observer implementation:
 
-void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
+void PowerMenuButton::PowerChanged(const PowerStatus& power_status) {
+  power_status_ = power_status;
   UpdateIconAndLabelInfo();
 }
 
@@ -358,23 +360,20 @@ void PowerMenuButton::PowerChanged(PowerLibrary* obj) {
 // PowerMenuButton, StatusAreaButton implementation:
 
 void PowerMenuButton::UpdateIconAndLabelInfo() {
-  PowerLibrary* power_lib = CrosLibrary::Get()->GetPowerLibrary();
-
-  battery_is_present_ = power_lib->IsBatteryPresent();
-  line_power_on_ = power_lib->IsLinePowerOn();
+  battery_is_present_ = power_status_.battery_is_present;
+  line_power_on_ = power_status_.line_power_on;
 
   // If fully charged, always show 100% even if internal number is a bit less.
-  if (power_lib->IsBatteryFullyCharged()) {
-    // We always call power_lib->GetBatteryPercentage() for test predictability.
-    power_lib->GetBatteryPercentage();
+  if (power_status_.battery_state == chromeos::BATTERY_STATE_FULLY_CHARGED)
     battery_percentage_ = 100.0;
-  } else {
-    battery_percentage_ = power_lib->GetBatteryPercentage();
-  }
+  else
+    battery_percentage_ = power_status_.battery_percentage;
 
-  UpdateBatteryTime(&battery_time_to_full_, power_lib->GetBatteryTimeToFull());
+  UpdateBatteryTime(&battery_time_to_full_,
+                    TimeDelta::FromSeconds(power_status_.battery_time_to_full));
   UpdateBatteryTime(&battery_time_to_empty_,
-                    power_lib->GetBatteryTimeToEmpty());
+                    TimeDelta::FromSeconds(
+                        power_status_.battery_time_to_empty));
 
   string16 tooltip_text;
   if (!battery_is_present_) {