Implemented nicer battery status

chrome/browser/chromeos/status/power_menu_button_browsertest.cc

Index: chrome/browser/chromeos/status/power_menu_button_browsertest.cc
diff --git a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
index c1a43136407bae426d3c933cd626675a412f23c5..515c325b0cac397b779bddde0f08d45f637678df 100644
--- a/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/power_menu_button_browsertest.cc
@@ -13,6 +13,9 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "grit/theme_resources.h"
 
+namespace {
+const int kNumBatteryStates = 20;
+}
 namespace chromeos {
 using ::testing::AnyNumber;
 using ::testing::InvokeWithoutArgs;
@@ -41,10 +44,10 @@ class PowerMenuButtonTest : public CrosInProcessBrowserTest {
     return power;
   }
 
-  int CallPowerChangedAndGetIconId() {
+  int CallPowerChangedAndGetBatteryIndex() {
     PowerMenuButton* power = GetPowerMenuButton();
     power->PowerChanged(mock_power_library_);
-    return power->icon_id();
+    return power->battery_index();
   }
 };
 
@@ -67,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryMissingTest) {
   EXPECT_CALL(*mock_power_library_, battery_time_to_full())
       .WillOnce((Return(base::TimeDelta::FromMinutes(24))))
       .RetiresOnSaturation();
-  EXPECT_EQ(IDR_STATUSBAR_BATTERY_MISSING, CallPowerChangedAndGetIconId());
+  EXPECT_EQ(-1, CallPowerChangedAndGetBatteryIndex());
 }
 
 IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargedTest) {
@@ -89,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargedTest) {
   EXPECT_CALL(*mock_power_library_, battery_time_to_full())
       .WillOnce((Return(base::TimeDelta::FromMinutes(0))))
       .RetiresOnSaturation();
-  EXPECT_EQ(IDR_STATUSBAR_BATTERY_CHARGED, CallPowerChangedAndGetIconId());
+  EXPECT_EQ(kNumBatteryStates - 1, CallPowerChangedAndGetBatteryIndex());
 }
 
 IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargingTest) {
@@ -115,38 +118,13 @@ IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargingTest) {
       .WillRepeatedly((Return(base::TimeDelta::FromMinutes(24))))
       .RetiresOnSaturation();
 
-  // Test the 16 battery charging states.
-  // NOTE: Use an array rather than just calculating a resource number to avoid
-  // creating implicit ordering dependencies on the resource values.
-  static const int kChargingImages[] = {
-    IDR_STATUSBAR_BATTERY_CHARGING_1,
-    IDR_STATUSBAR_BATTERY_CHARGING_2,
-    IDR_STATUSBAR_BATTERY_CHARGING_3,
-    IDR_STATUSBAR_BATTERY_CHARGING_4,
-    IDR_STATUSBAR_BATTERY_CHARGING_5,
-    IDR_STATUSBAR_BATTERY_CHARGING_6,
-    IDR_STATUSBAR_BATTERY_CHARGING_7,
-    IDR_STATUSBAR_BATTERY_CHARGING_8,
-    IDR_STATUSBAR_BATTERY_CHARGING_9,
-    IDR_STATUSBAR_BATTERY_CHARGING_10,
-    IDR_STATUSBAR_BATTERY_CHARGING_11,
-    IDR_STATUSBAR_BATTERY_CHARGING_12,
-    IDR_STATUSBAR_BATTERY_CHARGING_13,
-    IDR_STATUSBAR_BATTERY_CHARGING_14,
-    IDR_STATUSBAR_BATTERY_CHARGING_15,
-    IDR_STATUSBAR_BATTERY_CHARGING_16,
-    IDR_STATUSBAR_BATTERY_CHARGING_17,
-    IDR_STATUSBAR_BATTERY_CHARGING_18,
-    IDR_STATUSBAR_BATTERY_CHARGING_19,
-  };
-  size_t id = 0;
+  int index = 0;
   for (float percent = 5.0; percent < 100.0; percent += 5.0) {
     EXPECT_CALL(*mock_power_library_, battery_percentage())
         .WillOnce((Return(percent)))
         .RetiresOnSaturation();
-    ASSERT_LT(id, arraysize(kChargingImages));
-    EXPECT_EQ(kChargingImages[id], CallPowerChangedAndGetIconId());
-    id++;
+    EXPECT_EQ(index, CallPowerChangedAndGetBatteryIndex());
+    index++;
   }
 }
 
@@ -173,38 +151,13 @@ IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryDischargingTest) {
       .WillRepeatedly((Return(base::TimeDelta::FromMinutes(24))))
       .RetiresOnSaturation();
 
-  // Test the 16 battery discharing states.
-  // NOTE: Use an array rather than just calculating a resource number to avoid
-  // creating implicit ordering dependencies on the resource values.
-  static const int kDischargingImages[] = {
-    IDR_STATUSBAR_BATTERY_DISCHARGING_1,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_2,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_3,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_4,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_5,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_6,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_7,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_8,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_9,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_10,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_11,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_12,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_13,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_14,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_15,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_16,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_17,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_18,
-    IDR_STATUSBAR_BATTERY_DISCHARGING_19,
-  };
-  size_t id = 0;
+  int index = 0;
   for (float percent = 5.0; percent < 100.0; percent += 5.0) {
     EXPECT_CALL(*mock_power_library_, battery_percentage())
         .WillOnce((Return(percent)))
         .RetiresOnSaturation();
-    ASSERT_LT(id, arraysize(kDischargingImages));
-    EXPECT_EQ(kDischargingImages[id], CallPowerChangedAndGetIconId());
-    id++;
+    EXPECT_EQ(index, CallPowerChangedAndGetBatteryIndex());
+    index++;
   }
 }