retry cd95e0083676d5e: Remove some pre-md code and assets.

ash/common/system/chromeos/power/power_status_unittest.cc

 // Copyright (c) 2013 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 "ash/common/system/chromeos/power/power_status.h"
 
 #include <memory>
 
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using power_manager::PowerSupplyProperties;
 
 namespace ash {
 namespace {
@@ skipping 173 matching lines @@
   power_status_->SetProtoForTesting(prop);
   EXPECT_NE(info_charging_98,
             power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT));
 }
 
 // Tests that the |icon_badge| member of BatteryImageInfo is set correctly
 // with various power supply property values.
 TEST_F(PowerStatusTest, BatteryImageInfoIconBadge) {
   PowerSupplyProperties prop;
 
-  // A charging battery connected to AC power should have an ICON_BADGE_BOLT.
+  // A charging battery connected to AC power should have a bolt badge.
   prop.set_external_power(PowerSupplyProperties::AC);
   prop.set_battery_state(PowerSupplyProperties::CHARGING);
   prop.set_battery_percent(98.0);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_BOLT,
-      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+  const gfx::VectorIcon* bolt_icon =
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge;
+  EXPECT_TRUE(bolt_icon);
 
-  // A discharging battery connected to AC should also have an ICON_BADGE_BOLT.
+  // A discharging battery connected to AC should also have a bolt badge.
   prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
   power_status_->SetProtoForTesting(prop);
   EXPECT_EQ(
-      PowerStatus::ICON_BADGE_BOLT,
+      bolt_icon,
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
 
   // A charging battery connected to USB power should have an
-  // ICON_BADGE_UNRELIABLE.
+  // unreliable badge.
   prop.set_external_power(PowerSupplyProperties::USB);
   prop.set_battery_state(PowerSupplyProperties::CHARGING);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_UNRELIABLE,
-      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+  const gfx::VectorIcon* unreliable_icon =
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge;
+  EXPECT_NE(unreliable_icon, bolt_icon);
+  EXPECT_TRUE(unreliable_icon);
 
   // A discharging battery connected to USB power should also have an
-  // ICON_BADGE_UNRELIABLE.
+  // unreliable badge.
   prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
   power_status_->SetProtoForTesting(prop);
   EXPECT_EQ(
-      PowerStatus::ICON_BADGE_UNRELIABLE,
+      unreliable_icon,
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
 
-  // Show an ICON_BADGE_X when no battery is present.
+  // Show the right icon when no battery is present.
   prop.set_external_power(PowerSupplyProperties::DISCONNECTED);
   prop.set_battery_state(PowerSupplyProperties::NOT_PRESENT);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_X,
-      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+  const gfx::VectorIcon* x_icon =
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge;
+  EXPECT_TRUE(x_icon);
+  EXPECT_NE(bolt_icon, x_icon);
+  EXPECT_NE(unreliable_icon, x_icon);
 
   // Do not show a badge when the battery is discharging.
   prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_NONE,
+  EXPECT_FALSE(
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
 
-  // Show ICON_BADGE_ALERT for a discharging battery when it falls below
-  // a charge level of PowerStatus::kCriticalBatteryChargePercentageMd.
-  prop.set_battery_percent(PowerStatus::kCriticalBatteryChargePercentageMd);
+  // Show the right icon for a discharging battery when it falls below
+  // a charge level of PowerStatus::kCriticalBatteryChargePercentage.
+  prop.set_battery_percent(PowerStatus::kCriticalBatteryChargePercentage);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_NONE,
+  EXPECT_FALSE(
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
-  prop.set_battery_percent(PowerStatus::kCriticalBatteryChargePercentageMd - 1);
+  prop.set_battery_percent(PowerStatus::kCriticalBatteryChargePercentage - 1);
   power_status_->SetProtoForTesting(prop);
-  EXPECT_EQ(
-      PowerStatus::ICON_BADGE_ALERT,
-      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge);
+  const gfx::VectorIcon* alert_icon =
+      power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).icon_badge;
+  EXPECT_TRUE(alert_icon);
+  EXPECT_NE(bolt_icon, alert_icon);
+  EXPECT_NE(unreliable_icon, alert_icon);
+  EXPECT_NE(x_icon, alert_icon);
 }
 
 // Tests that the |charge_level| member of BatteryImageInfo is set correctly
 // with various power supply property values.
 TEST_F(PowerStatusTest, BatteryImageInfoChargeLevel) {
   PowerSupplyProperties prop;
 
   // No charge level is drawn when the battery is not present.
   prop.set_external_power(PowerSupplyProperties::DISCONNECTED);
   prop.set_battery_state(PowerSupplyProperties::NOT_PRESENT);
@@ skipping 38 matching lines @@
       11,
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
   prop.set_battery_percent(100.0);
   power_status_->SetProtoForTesting(prop);
   EXPECT_EQ(
       12,
       power_status_->GetBatteryImageInfo(PowerStatus::ICON_LIGHT).charge_level);
 }
 
 }  // namespace ash