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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
@@ skipping 150 matching lines @@
   }
 
   // BurnController::Delegate override.
   virtual void OnProgressWithRemainingTime(
       ProgressType progress_type,
       int64 amount_finished,
       int64 amount_total,
       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::kRemaining,
+                               ui::TimeFormat::kShort, time_remaining));
     SendProgressSignal(progress_type, amount_finished, amount_total,
                        time_remaining_text);
   }
 
   // BurnController::Delegate override.
   virtual void OnNetworkDetected() OVERRIDE {
     web_ui()->CallJavascriptFunction("browserBridge.reportNetworkDetected");
   }
 
   // BurnController::Delegate override.
@@ skipping 140 matching lines @@
 
 ImageBurnUI::ImageBurnUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   chromeos::imageburner::WebUIHandler* handler =
       new chromeos::imageburner::WebUIHandler(web_ui->GetWebContents());
   web_ui->AddMessageHandler(handler);
 
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(
       profile, chromeos::imageburner::CreateImageburnerUIHTMLSource());
 }