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

chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc

Index: chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
index 1442ecec1c5888915cd26ccace45cce84ead9902..04a06d4ea93c2d6c818407695932f0e7dec1170f 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
@@ -168,7 +168,8 @@ class WebUIHandler
       const base::TimeDelta& time_remaining) OVERRIDE {
     const base::string16 time_remaining_text = l10n_util::GetStringFUTF16(
         IDS_IMAGEBURN_DOWNLOAD_TIME_REMAINING,
-        ui::TimeFormat::TimeRemaining(time_remaining));
+        ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
+                               ui::TimeFormat::LENGTH_SHORT, time_remaining));
     SendProgressSignal(progress_type, amount_finished, amount_total,
                        time_remaining_text);
   }