Move low battery notification to Message Center.

ash/system/chromeos/power/power_status_view_unittest.cc

Index: ash/system/chromeos/power/power_status_view_unittest.cc
diff --git a/ash/system/chromeos/power/power_status_view_unittest.cc b/ash/system/chromeos/power/power_status_view_unittest.cc
index ebbb1a9c7df21339809edecc0bb8c98b20f59c42..be48566eb335fea25c05382917c00ba502cd86b1 100644
--- a/ash/system/chromeos/power/power_status_view_unittest.cc
+++ b/ash/system/chromeos/power/power_status_view_unittest.cc
@@ -24,7 +24,7 @@ class PowerStatusViewTest : public test::AshTestBase {
   // Overridden from testing::Test:
   void SetUp() override {
     test::AshTestBase::SetUp();
-    view_.reset(new PowerStatusView(GetViewType(), false));
+    view_.reset(new PowerStatusView(false));
   }
 
   void TearDown() override {
@@ -33,69 +33,26 @@ class PowerStatusViewTest : public test::AshTestBase {
   }
 
  protected:
-  virtual PowerStatusView::ViewType GetViewType() = 0;
-  PowerStatusView* view() { return view_.get(); }
-
   void UpdatePowerStatus(const power_manager::PowerSupplyProperties& proto) {
     PowerStatus::Get()->SetProtoForTesting(proto);
     view_->OnPowerStatusChanged();
   }
 

[Mr4D (OOO till 08-26), 2015/03/17 17:04:37]

Could you add a comment here that this is only needed for tests - and / or mark
them with a postfix (..ForTest())?

[michaelpg, 2015/03/17 18:32:45]

I'm not sure I understand -- this is already a test class, why do we need a
comment for these methods in particular?

[Mr4D (OOO till 08-26), 2015/03/17 22:25:04]

Argh. I looked up and down and landed here again. Ignore!

- private:
-  scoped_ptr<PowerStatusView> view_;
+  bool IsPercentageVisible() { return view_->percentage_label_->visible(); }
 
-  DISALLOW_COPY_AND_ASSIGN(PowerStatusViewTest);
-};
-
-class PowerStatusDefaultViewTest : public PowerStatusViewTest {
- public:
-  PowerStatusDefaultViewTest() {}
-  ~PowerStatusDefaultViewTest() override {}
-
- protected:
-  PowerStatusView::ViewType GetViewType() override {
-    return PowerStatusView::VIEW_DEFAULT;
-  }
-
-  bool IsPercentageVisible() {
-    return view()->percentage_label_->visible();
-  }
-
-  bool IsTimeStatusVisible() {
-    return view()->time_status_label_->visible();
-  }
+  bool IsTimeStatusVisible() { return view_->time_status_label_->visible(); }
 
   base::string16 RemainingTimeInView() {
-    return view()->time_status_label_->text();
+    return view_->time_status_label_->text();
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(PowerStatusDefaultViewTest);
-};
-
-class PowerStatusNotificationViewTest : public PowerStatusViewTest {
- public:
-  PowerStatusNotificationViewTest() {}
-  ~PowerStatusNotificationViewTest() override {}
-
- protected:
-  PowerStatusView::ViewType GetViewType() override {
-    return PowerStatusView::VIEW_NOTIFICATION;
-  }
-
-  base::string16 StatusInView() {
-    return view()->status_label_->text();
-  }
-
-  base::string16 RemainingTimeInView() {
-    return view()->time_label_->text();
-  }
+  scoped_ptr<PowerStatusView> view_;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(PowerStatusNotificationViewTest);
+  DISALLOW_COPY_AND_ASSIGN(PowerStatusViewTest);
 };
 
-TEST_F(PowerStatusDefaultViewTest, Basic) {
+TEST_F(PowerStatusViewTest, Basic) {
   EXPECT_FALSE(IsPercentageVisible());
   EXPECT_TRUE(IsTimeStatusVisible());
 
@@ -154,61 +111,4 @@ TEST_F(PowerStatusDefaultViewTest, Basic) {
   EXPECT_FALSE(IsTimeStatusVisible());
 }
 
-TEST_F(PowerStatusNotificationViewTest, Basic) {
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_FULL),
-            StatusInView());
-  EXPECT_TRUE(RemainingTimeInView().empty());
-
-  // Disconnect the power.
-  PowerSupplyProperties prop;
-  prop.set_external_power(PowerSupplyProperties::DISCONNECTED);
-  prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
-  prop.set_battery_percent(99.0);
-  prop.set_battery_time_to_empty_sec(125);
-  prop.set_is_calculating_battery_time(true);
-  UpdatePowerStatus(prop);
-
-  EXPECT_NE(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_FULL),
-            StatusInView());
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING),
-            RemainingTimeInView());
-
-  prop.set_is_calculating_battery_time(false);
-  UpdatePowerStatus(prop);
-  // Low power warning has to be calculated by ui::TimeFormat, but ignore
-  // seconds.
-  EXPECT_EQ(ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
-                                   ui::TimeFormat::LENGTH_LONG,
-                                   base::TimeDelta::FromMinutes(2)),
-            RemainingTimeInView());
-
-  prop.set_external_power(PowerSupplyProperties::AC);
-  prop.set_battery_state(PowerSupplyProperties::CHARGING);
-  prop.set_battery_time_to_full_sec(120);
-  UpdatePowerStatus(prop);
-  EXPECT_NE(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_FULL),
-            StatusInView());
-  // Charging time is somehow using another format?
-  EXPECT_NE(ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
-                                   ui::TimeFormat::LENGTH_LONG,
-                                   base::TimeDelta::FromMinutes(2)),
-            RemainingTimeInView());
-
-  // Unreliable connection.
-  prop.set_external_power(PowerSupplyProperties::USB);
-  UpdatePowerStatus(prop);
-  EXPECT_EQ(
-      l10n_util::GetStringUTF16(
-          IDS_ASH_STATUS_TRAY_BATTERY_CHARGING_UNRELIABLE),
-      RemainingTimeInView());
-
-  // Tricky -- connected to non-USB but still discharging. Not likely happening
-  // on production though.
-  prop.set_external_power(PowerSupplyProperties::AC);
-  prop.set_battery_state(PowerSupplyProperties::DISCHARGING);
-  prop.set_battery_time_to_full_sec(120);
-  UpdatePowerStatus(prop);
-  EXPECT_TRUE(RemainingTimeInView().empty());
-}
-
 }  // namespace ash