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

ash/system/logout_button/logout_confirmation_dialog_view.cc

 // Copyright 2014 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 "ash/system/logout_button/logout_confirmation_dialog_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/logout_button/logout_button_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 105 matching lines @@
   if (!delegate_)
     return;
   const base::TimeDelta time_remaining = countdown_start_time_ +
       duration_ - delegate_->GetCurrentTime();
   // Round the remaining time to nearest second, and use this value for
   // the countdown display and actual enforcement.
   int seconds_remaining = Round(time_remaining.InSecondsF());
   if (seconds_remaining > 0) {
     text_label_->SetText(l10n_util::GetStringFUTF16(
         IDS_ASH_LOGOUT_CONFIRMATION_WARNING,
-        ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromSeconds(
-            seconds_remaining))));
+        ui::TimeFormat::Simple(
+            ui::TimeFormat::kDuration, ui::TimeFormat::kLong,
+            base::TimeDelta::FromSeconds(seconds_remaining))));
   } else {
     text_label_->SetText(l10n_util::GetStringUTF16(
         IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));
     timer_.Stop();
     LogoutCurrentUser();
   }
 }
 
 }  // namespace internal
 }  // namespace ash