Merge 247397 "chromeos: Avoid notification for original Spring c..."

ash/system/chromeos/power/tray_power_unittest.cc

Index: ash/system/chromeos/power/tray_power_unittest.cc
===================================================================
--- ash/system/chromeos/power/tray_power_unittest.cc	(revision 247460)
+++ ash/system/chromeos/power/tray_power_unittest.cc	(working copy)
@@ -218,6 +218,18 @@
   safe_usb.set_battery_percent(TrayPower::kNoWarningPercentage - 0.1);
   EXPECT_FALSE(UpdateNotificationState(safe_usb));
   EXPECT_EQ(TrayPower::NOTIFICATION_NONE, notification_state());
+
+  // A notification shouldn't be shown when we're in the full state with an
+  // original Spring charger connected: http://crbug.com/338376
+  PowerSupplyProperties spring = DefaultPowerSupplyProperties();
+  spring.set_external_power(power_manager::
+      PowerSupplyProperties_ExternalPower_ORIGINAL_SPRING_CHARGER);
+  spring.set_battery_state(
+      power_manager::PowerSupplyProperties_BatteryState_FULL);
+  spring.set_battery_time_to_empty_sec(0);
+  spring.set_battery_time_to_full_sec(0);
+  EXPECT_FALSE(UpdateNotificationState(spring));
+  EXPECT_EQ(TrayPower::NOTIFICATION_NONE, notification_state());
 }
 
 }  // namespace internal