Fix browser test broken by resource ID ordering change.

chrome/browser/chromeos/status/power_menu_button_browsertest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/cros/mock_power_library.h"
@@ skipping 41 matching lines @@
 IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargedTest) {
   EXPECT_CALL(*mock_power_library_, battery_is_present())
       .WillRepeatedly((Return(true)));
   EXPECT_CALL(*mock_power_library_, battery_fully_charged())
       .WillRepeatedly((Return(true)));
   EXPECT_CALL(*mock_power_library_, line_power_on())
       .WillRepeatedly((Return(true)));
   EXPECT_EQ(IDR_STATUSBAR_BATTERY_CHARGED, CallPowerChangedAndGetIconId());
 }
 
-// http://crbug.com/48912
-IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, FAILS_BatteryChargingTest) {
+IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryChargingTest) {
   EXPECT_CALL(*mock_power_library_, battery_is_present())
       .WillRepeatedly((Return(true)));
   EXPECT_CALL(*mock_power_library_, battery_fully_charged())
       .WillRepeatedly((Return(false)));
   EXPECT_CALL(*mock_power_library_, line_power_on())
       .WillRepeatedly((Return(true)));
 
   // Test the 12 battery charging states.
-  int id = IDR_STATUSBAR_BATTERY_CHARGING_1;
-  for (float precent = 6.0; precent < 100.0; precent += 8.0) {
+  // 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,
+  };
+  size_t id = 0;
+  for (float percent = 6.0; percent < 100.0; percent += 8.0) {
     EXPECT_CALL(*mock_power_library_, battery_percentage())
-        .WillRepeatedly((Return(precent)));
-    EXPECT_EQ(id, CallPowerChangedAndGetIconId());
+        .WillRepeatedly((Return(percent)));
+    EXPECT_EQ(kChargingImages[id], CallPowerChangedAndGetIconId());
     id++;
+    ASSERT_LT(id, arraysize(kChargingImages));
   }
 }
 
-// http://crbug.com/48912
-IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, FAILS_BatteryDischargingTest) {
+IN_PROC_BROWSER_TEST_F(PowerMenuButtonTest, BatteryDischargingTest) {
   EXPECT_CALL(*mock_power_library_, battery_is_present())
       .WillRepeatedly((Return(true)));
   EXPECT_CALL(*mock_power_library_, battery_fully_charged())
       .WillRepeatedly((Return(false)));
   EXPECT_CALL(*mock_power_library_, line_power_on())
       .WillRepeatedly((Return(false)));
 
   // Test the 12 battery discharing states.
-  int id = IDR_STATUSBAR_BATTERY_DISCHARGING_1;
-  for (float precent = 6.0; precent < 100.0; precent += 8.0) {
+  // 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,
+  };
+  size_t id = 0;
+  for (float percent = 6.0; percent < 100.0; percent += 8.0) {
     EXPECT_CALL(*mock_power_library_, battery_percentage())
-        .WillRepeatedly((Return(precent)));
-    EXPECT_EQ(id, CallPowerChangedAndGetIconId());
+        .WillRepeatedly((Return(percent)));
+    EXPECT_EQ(kDischargingImages[id], CallPowerChangedAndGetIconId());
     id++;
+    ASSERT_LT(id, arraysize(kDischargingImages));
   }
 }
 
 }  // namespace chromeos