Revert 203952 "cros: Update charging not reliable battery status"

trunk/src/ash/system/chromeos/power/tray_power.cc

 // Copyright (c) 2012 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/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/power/power_status_view.h"
@@ skipping 199 matching lines @@
 }
 
 TrayPower::~TrayPower() {
   if (PowerManagerHandler::IsInitialized())
     PowerManagerHandler::Get()->RemoveObserver(this);
 }
 
 // static
 bool TrayPower::IsBatteryChargingUnreliable(
     const chromeos::PowerSupplyStatus& supply_status) {
-  // Sometimes devices can get into a state where the battery is almost fully
-  // charged and the power subsystem reports "neither charging nor discharging"
-  // despite the battery not at 100%. For now, only report unreliable charging
-  // on USB.
-  // TODO(derat): Update this when the power manager code is refactored for M29.
-  return supply_status.battery_state == PowerSupplyStatus::CONNECTED_TO_USB;
+  return
+      supply_status.battery_state ==
+          PowerSupplyStatus::NEITHER_CHARGING_NOR_DISCHARGING ||
+      supply_status.battery_state ==
+          PowerSupplyStatus::CONNECTED_TO_USB;
 }
 
 // static
 int TrayPower::GetBatteryImageIndex(
     const chromeos::PowerSupplyStatus& supply_status) {
   int image_index = 0;
   if (supply_status.battery_percentage >= 100) {
     image_index = kNumPowerImages - 1;
   } else if (!supply_status.battery_is_present) {
     image_index = kNumPowerImages;
@@ skipping 242 matching lines @@
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash