ChromeOs Power Emulation Impl

chromeos/dbus/fake_power_manager_client.cc

Index: chromeos/dbus/fake_power_manager_client.cc
diff --git a/chromeos/dbus/fake_power_manager_client.cc b/chromeos/dbus/fake_power_manager_client.cc
index 6c9a3872726a62a4ba5f0f2f353219f2e885b950..77e090fbf91bf5ad0e6e9acf21412f63b2bd582b 100644
--- a/chromeos/dbus/fake_power_manager_client.cc
+++ b/chromeos/dbus/fake_power_manager_client.cc
@@ -4,11 +4,18 @@
 
 #include "chromeos/dbus/fake_power_manager_client.h"
 
+#include <algorithm>

[mozartalouis, 2015/06/30 02:16:09]

will remove. not used.

+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time/time.h"
 
 namespace chromeos {
+namespace {
+
+const int kDefaultBatteryLifeSpanSec = 6 * 3600;  // 6 hours
+
+}  // namespace
 
 FakePowerManagerClient::FakePowerManagerClient()
     : num_request_restart_calls_(0),
@@ -23,6 +30,9 @@ FakePowerManagerClient::~FakePowerManagerClient() {
 }
 
 void FakePowerManagerClient::Init(dbus::Bus* bus) {
+  UpdatePowerProperties(
+      50, false, power_manager::PowerSupplyProperties_BatteryState_DISCHARGING,
+      power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED);
 }
 
 void FakePowerManagerClient::AddObserver(Observer* observer) {
@@ -34,7 +44,7 @@ void FakePowerManagerClient::RemoveObserver(Observer* observer) {
 }
 
 bool FakePowerManagerClient::HasObserver(const Observer* observer) const {
-  return false;
+  return observers_.HasObserver(observer);
 }
 
 void FakePowerManagerClient::SetRenderProcessManagerDelegate(
@@ -63,6 +73,7 @@ void FakePowerManagerClient::IncreaseKeyboardBrightness() {
 }
 
 void FakePowerManagerClient::RequestStatusUpdate() {
+  NotifyObservers();
 }
 
 void FakePowerManagerClient::RequestSuspend() {
@@ -129,6 +140,62 @@ void FakePowerManagerClient::SendPowerButtonEvent(
                     PowerButtonEventReceived(down, timestamp));
 }
 
+void FakePowerManagerClient::UpdatePowerProperties(
+    int battery_percent,
+    bool is_calculating_battery_time,
+    power_manager::PowerSupplyProperties::BatteryState battery_state,
+    power_manager::PowerSupplyProperties::ExternalPower external_power) {
+  int remaining_battery_sec =
+      battery_percent * kDefaultBatteryLifeSpanSec / 100;
+
+  // Sets the charging state based on the battery percentage to mimic real
+  // implementation.
+  if (battery_percent == 100 &&
+      battery_state ==
+          power_manager::PowerSupplyProperties_BatteryState_CHARGING) {
+    props_.set_battery_state(
+        power_manager::PowerSupplyProperties_BatteryState_FULL);
+    props_.set_battery_time_to_full_sec(0);
+    props_.set_battery_time_to_empty_sec(0);
+  } else if (battery_state ==
+             power_manager::PowerSupplyProperties_BatteryState_CHARGING) {
+    props_.set_battery_state(
+        power_manager::PowerSupplyProperties_BatteryState_CHARGING);
+    props_.set_battery_time_to_full_sec(kDefaultBatteryLifeSpanSec -
+                                        remaining_battery_sec);
+    props_.set_battery_time_to_empty_sec(0);
+  } else {
+    props_.set_battery_state(
+        power_manager::PowerSupplyProperties_BatteryState_DISCHARGING);
+    props_.set_battery_time_to_full_sec(0);
+    props_.set_battery_time_to_empty_sec(remaining_battery_sec);
+  }

[Daniel Erat, 2015/06/30 14:03:40]

it seems like the handling of _FULL is broken here. did you mean to include it
in the top condition?

[mozartalouis, 2015/06/30 18:29:47]

No. The reason _FULL is not handled is because it will be set once the battery
is at 100% and the battery state is charging. For instance, if the battery is no
longer charging, then it should display the time remaining. Let me know if you
have any objections :)

[Daniel Erat, 2015/06/30 20:35:18]

i don't think i follow. if i call:

  UpdatePowerProperties(100, false, _FULL, _AC);

then it looks like this method isn't going to update the battery state in props_
at all. that's contrary to what i would expect.

(and as mentioned in the last round, please add a
fake_power_manager_client_unittest.cc file and some tests in this change.)

[mozartalouis, 2015/06/30 21:29:50]

OH! I understand. Added in next patch.

+
+  // checks if the battery is in a discharging state first before setting a

[Daniel Erat, 2015/06/30 14:03:40]

nit: capitalize 'Checks'

[mozartalouis, 2015/06/30 18:29:47]

Done.

+  // charger. It wouldn't make sense for the battery to be discharging on AC,
+  // but it is possible for it to be discharging on low power USB.
+  if (battery_state ==
+      power_manager::PowerSupplyProperties_BatteryState_DISCHARGING)

[Daniel Erat, 2015/06/30 14:03:40]

multiline "then" sections of if/else statements should have curly brackets:

  if (battery_state ==
      ...) {
    ...
  } else {
    ...
  }

[mozartalouis, 2015/06/30 18:29:47]

Done.

+    props_.set_external_power(
+        external_power == power_manager::PowerSupplyProperties_ExternalPower_USB
+            ? power_manager::PowerSupplyProperties_ExternalPower_USB
+            : power_manager::PowerSupplyProperties_ExternalPower_DISCONNECTED);
+  else
+    props_.set_external_power(
+        external_power == power_manager::PowerSupplyProperties_ExternalPower_USB
+            ? power_manager::PowerSupplyProperties_ExternalPower_USB
+            : power_manager::PowerSupplyProperties_ExternalPower_AC);
+
+  props_.set_battery_percent(battery_percent);
+  props_.set_is_calculating_battery_time(is_calculating_battery_time);
+
+  NotifyObservers();
+}
+
+void FakePowerManagerClient::NotifyObservers() {
+  FOR_EACH_OBSERVER(Observer, observers_, PowerChanged(props_));
+}
+
 void FakePowerManagerClient::HandleSuspendReadiness() {
   CHECK(num_pending_suspend_readiness_callbacks_ > 0);