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

ash/system/chromeos/power/tray_power_unittest.cc

 // Copyright 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/system/chromeos/power/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
@@ skipping 200 matching lines @@
   critical_usb.set_battery_percent(TrayPower::kCriticalPercentage + 0.2);
   EXPECT_TRUE(UpdateNotificationState(critical_usb));
   EXPECT_EQ(TrayPower::NOTIFICATION_CRITICAL, notification_state());
 
   PowerSupplyProperties safe_usb = DefaultPowerSupplyProperties();
   safe_usb.set_external_power(
       power_manager::PowerSupplyProperties_ExternalPower_USB);
   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
 }  // namespace ash