Move power_supply_status.* from src/ash to src/chromeos

chrome/browser/chromeos/dbus/power_manager_client.h

Index: chrome/browser/chromeos/dbus/power_manager_client.h
diff --git a/chrome/browser/chromeos/dbus/power_manager_client.h b/chrome/browser/chromeos/dbus/power_manager_client.h
index 0dd32d7e8d0eb91a3a3d4a3285ae9610dc5f10d4..0c7c3b153849347fe7fbd15e4d306b9e35a4cf05 100644
--- a/chrome/browser/chromeos/dbus/power_manager_client.h
+++ b/chrome/browser/chromeos/dbus/power_manager_client.h
@@ -11,9 +11,7 @@
 #include "base/callback.h"
 #include "chrome/browser/chromeos/dbus/dbus_client_implementation_type.h"
 
-#if defined(USE_ASH)
-#include "ash/system/power/power_supply_status.h"
-#endif
+#include "chromeos/dbus/power_supply_status.h"
 
 namespace base {
 class TimeTicks;
@@ -24,27 +22,6 @@ class Bus;
 
 namespace chromeos {
 
-#if defined(USE_ASH)
-typedef struct ash::PowerSupplyStatus PowerSupplyStatus;
-#else
-// This is the local struct that is used in Chrome.
-struct PowerSupplyStatus {
-  bool line_power_on;
-
-  bool battery_is_present;
-  bool battery_is_full;
-
-  // Time in seconds until the battery is empty or full, 0 for unknown.
-  int64 battery_seconds_to_empty;
-  int64 battery_seconds_to_full;
-
-  double battery_percentage;
-
-  PowerSupplyStatus();
-  std::string ToString() const;
-};
-#endif
-
 // Callback used for processing the idle time.  The int64 param is the number of
 // seconds the user has been idle.
 typedef base::Callback<void(int64)> CalculateIdleTimeCallback;