Add support for localized time strings with two units, eg. "2 hours 17 minutes"

ash/system/chromeos/power/power_status_view.cc

Index: ash/system/chromeos/power/power_status_view.cc
diff --git a/ash/system/chromeos/power/power_status_view.cc b/ash/system/chromeos/power/power_status_view.cc
index d930f68156a2757a3fe5e96256efff224866436b..dbcf1e1ce77a0bfbe68ec413a002907327fb634f 100644
--- a/ash/system/chromeos/power/power_status_view.cc
+++ b/ash/system/chromeos/power/power_status_view.cc
@@ -186,7 +186,8 @@ void PowerStatusView::UpdateTextForNotificationView() {
               base::IntToString16(min)));
     } else {
       // This is a low battery warning prompting the user in minutes.
-      time_label_->SetText(ui::TimeFormat::TimeRemainingLong(
+      time_label_->SetText(ui::TimeFormat::Simple(
+          ui::TimeFormat::FORMAT_REMAINING, ui::TimeFormat::LENGTH_LONG,
           base::TimeDelta::FromMinutes(hour * 60 + min)));
     }
   } else {